From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Sat, 21 May 2011 18:43:46 +0000 (+0000)
Subject: i18n: git-am gettext + gettext to stderr message
X-Git-Tag: v1.7.7-rc0~116^2~43
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=22fdd11432d6177ad6f8b9e32f0c4a8101542786;p=git.git

i18n: git-am gettext + gettext to stderr message

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/git-am.sh b/git-am.sh
index 7c0273c9a..d56c7e9df 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
 }