diff options
| author |  Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2011-02-22 23:41:45 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-03-09 23:52:54 -0800 |
| commit | 9c227655b02c8f84e319a57bb8dd7cff63e3fbf8 (patch) | |
| tree | 24bdb4fa3d3780061bcda184af799a188942a41a /t/t6029-merge-subtree.sh | |
| parent | i18n: git-commit basic messages (diff) | |
| download | tgif-9c227655b02c8f84e319a57bb8dd7cff63e3fbf8.tar.xz | |
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>
Diffstat (limited to 't/t6029-merge-subtree.sh')
0 files changed, 0 insertions, 0 deletions