summaryrefslogtreecommitdiff
path: root/git-am.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-05-21 11:02:18 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-05-21 11:02:18 (GMT)
commitedea184a585c9bda560995f676092879a42e3e7a (patch)
treef04261e157efac067a9c99979abd06274e5c4dd3 /git-am.sh
parenta660534e06147f8867d6c9b6c41025427a7b5c6c (diff)
parent0ba17dd0229582481d048388024741cfef3298a3 (diff)
downloadgit-edea184a585c9bda560995f676092879a42e3e7a.zip
git-edea184a585c9bda560995f676092879a42e3e7a.tar.gz
git-edea184a585c9bda560995f676092879a42e3e7a.tar.bz2
Merge branch 'jc/am-3-show-corrupted-patch'
* jc/am-3-show-corrupted-patch: am -3: recover the diagnostic messages for corrupt patches
Diffstat (limited to 'git-am.sh')
-rwxr-xr-xgit-am.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-am.sh b/git-am.sh
index 1056075..87ffae2 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -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