diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-10-26 22:55:15 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-10-26 22:55:15 (GMT) |
| commit | 9c53de7de12abfb9c13f5e7a82024680e3a90944 (patch) | |
| tree | 923fe252ae0c6d7cd64ebe1a30e531b95aaecaa4 /diff.h | |
| parent | 74301d6edeb0e081a4ef864057952b6a7ff2b4be (diff) | |
| parent | c63d4b2fe86876cc210d8bf22bd84d617f7815b7 (diff) | |
| download | git-9c53de7de12abfb9c13f5e7a82024680e3a90944.zip git-9c53de7de12abfb9c13f5e7a82024680e3a90944.tar.gz git-9c53de7de12abfb9c13f5e7a82024680e3a90944.tar.bz2 | |
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 'diff.h')
0 files changed, 0 insertions, 0 deletions