From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 26 Oct 2015 22:55:15 +0000 (-0700)
Subject: Merge branch 'jc/am-3-fallback-regression-fix'
X-Git-Tag: v2.7.0-rc0~82
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9c53de7de12abfb9c13f5e7a82024680e3a90944;p=git

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

"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
---

9c53de7de12abfb9c13f5e7a82024680e3a90944