diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-05-21 15:02:18 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-05-21 15:02:18 +0400 |
| commit | edea184a585c9bda560995f676092879a42e3e7a (patch) | |
| tree | f04261e157efac067a9c99979abd06274e5c4dd3 | |
| parent | a660534e06147f8867d6c9b6c41025427a7b5c6c (diff) | |
| parent | 0ba17dd0229582481d048388024741cfef3298a3 (diff) | |
Merge branch 'jc/am-3-show-corrupted-patch'
* jc/am-3-show-corrupted-patch:
am -3: recover the diagnostic messages for corrupt patches
| -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 |