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>
Ævar Arnfjörð Bjarmason committed
Feb 22, 2011 at 23:42 UTC
2ce216eeda0ed3daf7dbcefe9758a5153c6f9d5a
1 file changed
+1
-1
t/t3030-merge-recursive.sh
+1
-1
@@ -312,7 +312,7 @@ test_expect_success 'merge-recursive result' '
312
313
'
314
315
-test_expect_success 'fail if the index has unresolved entries' '
315
+test_expect_success C_LOCALE_OUTPUT 'fail if the index has unresolved entries' '
316
317
rm -fr [abcd] &&
318
git checkout -f "$c1" &&