From: Ævar Arnfjörð Bjarmason Date: Tue, 22 Feb 2011 23:42:01 +0000 (+0000) Subject: i18n: git-merge "You have not concluded your merge" messages X-Git-Tag: v1.7.5-rc1~19^2~31 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=2ce216eeda0ed3daf7dbcefe9758a5153c6f9d5a;p=git.git 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 Signed-off-by: Junio C Hamano --- diff --git a/t/t3030-merge-recursive.sh b/t/t3030-merge-recursive.sh index 34794f8a7..806fdccce 100755 --- a/t/t3030-merge-recursive.sh +++ b/t/t3030-merge-recursive.sh @@ -312,7 +312,7 @@ test_expect_success 'merge-recursive result' ' ' -test_expect_success 'fail if the index has unresolved entries' ' +test_expect_success C_LOCALE_OUTPUT 'fail if the index has unresolved entries' ' rm -fr [abcd] && git checkout -f "$c1" &&