diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-09-07 11:09:04 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-07 11:09:04 -0700 |
| commit | e245397434f8d26bf18053823c3fb9d1374679bd (patch) | |
| tree | 286620eaf35b17ab5df0a7d4e8fe42d51a2b79fd /git-am.sh | |
| parent | 7fe136d78f5db3317ebf60115c1d7faa87412d6a (diff) | |
| parent | a312a271b92fe74f5954adbb824987b040926c4c (diff) | |
| download | git-e245397434f8d26bf18053823c3fb9d1374679bd.tar.gz | |
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
Diffstat (limited to 'git-am.sh')
| -rwxr-xr-x | git-am.sh | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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 |