Merge branch 'jf/am-failure-report'

* jf/am-failure-report:
git-am: re-fix the diag message printing
git-am: Make it easier to see which patch failed

diff --git a/git-am.sh b/git-am.sh
index 4beb12dcf5e94c0bc0decf8720f4a622b8b2d325..e20dd88392c892a6b88e29501e0b13be8a73aaf9 100755 (executable)
--- a/git-am.sh
+++ b/git-am.sh
@@ -510,7 +510,7 @@ do
        fi
        if test $apply_status != 0
        then
-               echo Patch failed at $msgnum.
+               printf 'Patch failed at %s %s\n' "$msgnum" "$FIRSTLINE"
                stop_here_user_resolve $this
        fi