summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Ævar Arnfjörð Bjarmason <avarab@gmail.com>2011-05-21 18:43:46 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-05-21 11:57:14 -0700
commit22fdd11432d6177ad6f8b9e32f0c4a8101542786 (patch)
tree51b32fea8eb6a7c8f9b09a33dbc7487f0b1e2114
parenti18n: git-am eval_gettext messages (diff)
downloadtgif-22fdd11432d6177ad6f8b9e32f0c4a8101542786.tar.xz
i18n: git-am gettext + gettext to stderr message
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xgit-am.sh7
1 files changed, 5 insertions, 2 deletions
diff --git a/git-am.sh b/git-am.sh
index 7c0273c9ad..d56c7e9df9 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -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
}