projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 2ceb61e) | patch
i18n: git-merge "You have not concluded your merge" messages
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>
Tue, 22 Feb 2011 23:42:01 +0000 (23:42 +0000)
committerJunio C Hamano <gitster@pobox.com>
Thu, 10 Mar 2011 07:52:55 +0000 (23:52 -0800)
commit2ce216eeda0ed3daf7dbcefe9758a5153c6f9d5a
tree95d0250ece801e4b66c44bd7583f8c693114aa0atree | snapshot
parent2ceb61e0a030eddd46cc62e4d9a0fbf2d16faad1commit | diff
i18n: git-merge "You have not concluded your merge" messages

Gettextize the "You have not concluded your merge messages. A test in
t3030-merge-recursive.sh explicitly checked for this message. Change
it to skip the test under GETTEXT_POISON=YesPlease.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t3030-merge-recursive.sh diff | blob | history
Git—the stupid content tracker