From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 16 Jun 2010 23:21:23 +0000 (-0700)
Subject: Merge branch 'jc/am-3-show-corrupted-patch' into maint
X-Git-Tag: v1.7.2-rc0~63^2~12
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/d6bf0cf9bf59257d587e37a6b689a22dc8a9092a?hp=f62e53c897c359b5885c474c41341d83845a78f6

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
---

diff --git a/git-am.sh b/git-am.sh
index 1056075545..87ffae252b 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