diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-10-26 15:55:15 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-10-26 15:55:15 -0700 |
| commit | 9c53de7de12abfb9c13f5e7a82024680e3a90944 (patch) | |
| tree | 923fe252ae0c6d7cd64ebe1a30e531b95aaecaa4 /xdiff-interface.h | |
| parent | Sync with maint (diff) | |
| parent | am -3: do not let failed merge from completing the error codepath (diff) | |
| download | tgif-9c53de7de12abfb9c13f5e7a82024680e3a90944.tar.xz | |
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
Diffstat (limited to 'xdiff-interface.h')
0 files changed, 0 insertions, 0 deletions