1 files changed, 1 insertions, 1 deletions
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