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
2010-06-16 16:21:23 -07:00 · 2010-06-16 16:21:23 -07:00 · d6bf0cf9bf
parent f62e53c897 0ba17dd022
commit d6bf0cf9bf
1 changed files with 1 additions and 1 deletions
--- 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