diff options
author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2011-05-21 18:43:46 +0000 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-05-21 11:57:14 -0700 |
commit | 22fdd11432d6177ad6f8b9e32f0c4a8101542786 (patch) | |
tree | 51b32fea8eb6a7c8f9b09a33dbc7487f0b1e2114 | |
parent | a4372c373bc4f1a36137af315a8f8fe20385203b (diff) | |
download | git-22fdd11432d6177ad6f8b9e32f0c4a8101542786.tar.gz |
i18n: git-am gettext + gettext to stderr message
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-x | git-am.sh | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -89,8 +89,11 @@ safe_to_abort () { then return 0 fi - echo >&2 "You seem to have moved HEAD since the last 'am' failure." - echo >&2 "Not rewinding to ORIG_HEAD" + ( + gettext "You seem to have moved HEAD since the last 'am' failure. +Not rewinding to ORIG_HEAD" && + echo + ) >&2 return 1 } |