Ævar Arnfjörð Bjarmason 9c227655b0 i18n: git-commit "middle of a merge" message ...

Gettextize the "You are in the middle of a merge -- cannot amend."
message. Several tests in t7110-reset-merge.sh explicitly checked for
this message. Change them to skip under GETTEXT_POISON=YesPlease.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

2011-03-09 23:52:54 -08:00

41 KiB

Raw Blame History

View Raw