From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 3 Nov 2015 23:32:39 +0000 (-0800)
Subject: Merge branch 'jc/am-3-fallback-regression-fix' into maint
X-Git-Tag: v2.6.3~19
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ced2321a8df8260e7d22e72e2bb5b8c6ab3f2180

Merge branch 'jc/am-3-fallback-regression-fix' into maint

"git am -3" had a small regression where it is aborted in its error
handling codepath when underlying merge-recursive failed in certain
ways, as it assumed that the internal call to merge-recursive will
never die, which is not the case (yet).

* jc/am-3-fallback-regression-fix:
am -3: do not let failed merge from completing the error codepath
---

ced2321a8df8260e7d22e72e2bb5b8c6ab3f2180