X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft3030-merge-recursive.sh;h=0c02d569520ddc81b32db7d248197562d00bd7ea;hb=018443526875456d335fef2dfbc78bc4de2d340d;hp=806fdccce1db994899509cb3dd9d7801b84c48ba;hpb=ac9666f84a597973ef29dc7f0f7edcb3e1a3aa45;p=git.git

diff --git a/t/t3030-merge-recursive.sh b/t/t3030-merge-recursive.sh
index 806fdccce..0c02d5695 100755
--- a/t/t3030-merge-recursive.sh
+++ b/t/t3030-merge-recursive.sh
@@ -312,20 +312,20 @@ test_expect_success 'merge-recursive result' '
 
 '
 
-test_expect_success C_LOCALE_OUTPUT 'fail if the index has unresolved entries' '
+test_expect_success 'fail if the index has unresolved entries' '
 
 	rm -fr [abcd] &&
 	git checkout -f "$c1" &&
 
 	test_must_fail git merge "$c5" &&
 	test_must_fail git merge "$c5" 2> out &&
-	grep "not possible because you have unmerged files" out &&
+	test_i18ngrep "not possible because you have unmerged files" out &&
 	git add -u &&
 	test_must_fail git merge "$c5" 2> out &&
-	grep "You have not concluded your merge" out &&
+	test_i18ngrep "You have not concluded your merge" out &&
 	rm -f .git/MERGE_HEAD &&
 	test_must_fail git merge "$c5" 2> out &&
-	grep "Your local changes to the following files would be overwritten by merge:" out
+	test_i18ngrep "Your local changes to the following files would be overwritten by merge:" out
 '
 
 test_expect_success 'merge-recursive remove conflict' '