Merge branch 'maint-1.7.11' into maint

[git.git] / git-am.sh

diff --git a/git-am.sh b/git-am.sh
index a1f3f3055a1d1c4730c3b9c5ebc81c253ce160d6..bd9620c6c6b25a083dacc0bb3fe9d45337ed0d7b 100755 (executable)
--- a/git-am.sh
+++ b/git-am.sh
@@ -853,6 +853,11 @@ did you forget to use 'git add'?"
        if test $apply_status != 0
        then
                eval_gettextln 'Patch failed at $msgnum $FIRSTLINE'
+               if test "$(git config --bool advice.amworkdir)" != false
+               then
+                       eval_gettextln "The copy of the patch that failed is found in:
+   $dotest/patch"
+               fi
                stop_here_user_resolve $this
        fi