i18n: git-am gettext + gettext to stderr message
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
a4372c373b
commit
22fdd11432
@ -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
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user