X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-am.sh;h=87ffae252b3f2ff88646d142ea9c2dfb38a28953;hb=3b65270dcc1fe2d16f055d1a36a29616b9f89141;hp=1056075545ad3e5e42626d167c91c1deada6186b;hpb=b7d0da858bb2f22c6ef3dbb20c1ded0302f4eaca;p=git.git

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