diff --git a/git-am.sh b/git-am.sh
index e26c54a3e2..4e0e40677c 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -534,7 +534,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