diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-06-16 16:21:23 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-16 16:21:23 -0700 |
| commit | d6bf0cf9bf59257d587e37a6b689a22dc8a9092a (patch) | |
| tree | f723c7c3c29833d2b8591521f42f14c8abbf542e /git-am.sh | |
| parent | f62e53c897c359b5885c474c41341d83845a78f6 (diff) | |
| parent | 0ba17dd0229582481d048388024741cfef3298a3 (diff) | |
| download | git-d6bf0cf9bf59257d587e37a6b689a22dc8a9092a.tar.gz | |
Merge branch 'jc/am-3-show-corrupted-patch' into maint
* jc/am-3-show-corrupted-patch:
am -3: recover the diagnostic messages for corrupt patches
Diffstat (limited to 'git-am.sh')
| -rwxr-xr-x | git-am.sh | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -740,7 +740,7 @@ do ;; esac - if test $apply_status = 1 && test "$threeway" = t + if test $apply_status != 0 && test "$threeway" = t then if (fall_back_3way) then |