X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft3030-merge-recursive.sh;h=806fdccce1db994899509cb3dd9d7801b84c48ba;hb=fea6128baec24fcfe9433a34a06bd9d6e6298bab;hp=34794f8a70e1c9b71384363e022d08da4ac8872e;hpb=759e84f07fd0fba2f3466b11b74146173d42cb6b;p=git.git

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" &&