diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-11-03 15:32:39 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-11-03 15:32:39 -0800 |
| commit | ced2321a8df8260e7d22e72e2bb5b8c6ab3f2180 (patch) | |
| tree | d3a03df048d44183f43ae5506f5e5fe43c4154c5 /rerere.c | |
| parent | f5f76845961f4207b3dc8c186b2356f160276e45 (diff) | |
| parent | c63d4b2fe86876cc210d8bf22bd84d617f7815b7 (diff) | |
| download | git-ced2321a8df8260e7d22e72e2bb5b8c6ab3f2180.tar.gz git-ced2321a8df8260e7d22e72e2bb5b8c6ab3f2180.tar.xz | |
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
Diffstat (limited to 'rerere.c')
0 files changed, 0 insertions, 0 deletions