Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'nd/am-i18n-fix'
author
Junio C Hamano
<gitster@pobox.com>
Fri, 7 Sep 2012 18:09:04 +0000
(11:09 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Fri, 7 Sep 2012 18:09:04 +0000
(11:09 -0700)
"git am" wasn't marked up for i18n properly.
* nd/am-i18n-fix:
am: quote string for translation before passing to eval_gettextln
git-am.sh
patch
|
blob
|
history
raw
(from parent 1:
7fe136d
)
diff --git
a/git-am.sh
b/git-am.sh
index bd9620c6c6b25a083dacc0bb3fe9d45337ed0d7b..c682d34094d618734ac52d6d7e15a6c10ccfdeb6 100755
(executable)
--- a/
git-am.sh
+++ b/
git-am.sh
@@
-855,8
+855,8
@@
did you forget to use 'git add'?"
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
"
+ eval_gettextln
'
The copy of the patch that failed is found in:
+ $dotest/patch
'
fi
stop_here_user_resolve $this
fi