author | Junio C Hamano <gitster@pobox.com> | |
Fri, 21 May 2010 11:02:18 +0000 (04:02 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Fri, 21 May 2010 11:02:18 +0000 (04:02 -0700) |
* jc/am-3-show-corrupted-patch:
am -3: recover the diagnostic messages for corrupt patches
am -3: recover the diagnostic messages for corrupt patches
git-am.sh | patch | blob | history |
diff --git a/git-am.sh b/git-am.sh
index 1056075545ad3e5e42626d167c91c1deada6186b..87ffae252b3f2ff88646d142ea9c2dfb38a28953 100755 (executable)
--- a/git-am.sh
+++ b/git-am.sh
;;
esac
- if test $apply_status = 1 && test "$threeway" = t
+ if test $apply_status != 0 && test "$threeway" = t
then
if (fall_back_3way)
then