Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'jk/clone-cmdline-config'
[gitweb.git]
/
git-am.sh
diff --git
a/git-am.sh
b/git-am.sh
index 72d4c03b62a51710f405e580cc3741f1018d6138..463c741dfc259927b4429f19972ced21d87c215e 100755
(executable)
--- a/
git-am.sh
+++ b/
git-am.sh
@@
-797,7
+797,7
@@
did you forget to use 'git add'?"; echo
fi
if test $apply_status != 0
then
- printf 'Patch failed at %s %s\n' "$msgnum" "$FIRSTLINE"
+ eval_gettext 'Patch failed at $msgnum $FIRSTLINE'; echo
stop_here_user_resolve $this
fi