| commit | 9c227655b02c8f84e319a57bb8dd7cff63e3fbf8 | |
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | |
| Tue, 22 Feb 2011 23:41:45 +0000 (22 23:41 +0000) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 10 Mar 2011 07:52:54 +0000 (9 23:52 -0800) | ||
| tree | 24bdb4fa3d3780061bcda184af799a188942a41a | treesnapshot (tar.gz zip) |
| parent | 8a6179bcb6022c433ac87a01393155d64166eb7b | commitdiff |
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>
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>
| builtin/commit.c | diffblobblamehistory | |
| t/t7110-reset-merge.sh | diffblobblamehistory |