Browse files

Merge branch 'nd/am-i18n-fix'

"git am" wasn't marked up for i18n properly.

* nd/am-i18n-fix:
  am: quote string for translation before passing to eval_gettextln
  • Loading branch information...
2 parents 7fe136d + a312a27 commit e245397434f8d26bf18053823c3fb9d1374679bd @gitster gitster committed Sep 7, 2012
Showing with 2 additions and 2 deletions.
  1. +2 −2 git-am.sh
View
4 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

0 comments on commit e245397

Please sign in to comment.