From: Ævar Arnfjörð Bjarmason Date: Tue, 22 Feb 2011 23:42:01 GMT Subject: [PATCH v4 42/73] gettextize: git-merge "You have not concluded your merge" messages Message-ID: <1298418152-27789-43-git-send-email-avarab@gmail.com> In-Reply-To: <7vhbbwdjnm.fsf@alter.siamese.dyndns.org> 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 --- t/t3030-merge-recursive.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/t/t3030-merge-recursive.sh b/t/t3030-merge-recursive.sh index 34794f8..806fdcc 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" && -- 1.7.2.3