merge-recursive: use find_commit_subject() instead of custom code

diff --git a/git-am.sh b/git-am.sh
index abcb05b6baa8693fa6af021905b17a72d4f408e3..1df5b04146a118831f4b8d30652aa506c7e4b02e 100755 (executable)
--- a/git-am.sh
+++ b/git-am.sh
@@ -746,7 +746,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