From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 20 Apr 2012 22:49:37 +0000 (-0700)
Subject: Merge branch 'jc/am-report-3way'
X-Git-Tag: v1.7.11-rc0~139
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=bb52e7f600c9732c624ffc27f8321f55c4b4d90b;p=git.git

Merge branch 'jc/am-report-3way'

When "git am -3" needs to fall back to an application to a synthesized
preimage followed by a 3-way merge, the paths that needed such treatment
are now reported to the end user, so that the result in them can be
eyeballed with extra care.

* jc/am-report-3way:
  am -3: list the paths that needed 3-way fallback
---

bb52e7f600c9732c624ffc27f8321f55c4b4d90b