am -3: recover the diagnostic messages for corrupt patches

[~andy/git] / git-am.sh

diff --git a/git-am.sh b/git-am.sh
index e26c54a3e24265d26b6d7acb07d0bf89135bb4bc..4e0e40677c4583fe65a3c503115dca16a515ad81 100755 (executable)
--- 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