X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft7607-merge-overwrite.sh;h=72a8731d5e28d71577d0c53fc25a5ddc1d2ad6de;hb=85c4a0d0482525480de4b575445ef8721858eff7;hp=ef84f04102ed067768c66ea9608b98d47851eb8b;hpb=4bbfd8e3da6d5fde8f1e98900523996fd138d9fc;p=git.git

diff --git a/t/t7607-merge-overwrite.sh b/t/t7607-merge-overwrite.sh
index ef84f0410..72a8731d5 100755
--- a/t/t7607-merge-overwrite.sh
+++ b/t/t7607-merge-overwrite.sh
@@ -150,11 +150,8 @@ test_expect_success 'will not overwrite untracked file on unborn branch' '
 	git rm -fr . &&
 	git checkout --orphan new &&
 	cp important c0.c &&
-	test_must_fail git merge c0 2>out
-'
-
-test_expect_success C_LOCALE_OUTPUT 'will not overwrite untracked file on unborn branch: output' '
-	test_cmp out expect
+	test_must_fail git merge c0 2>out &&
+	test_i18ncmp out expect
 '
 
 test_expect_success 'will not overwrite untracked file on unborn branch .git/MERGE_HEAD sanity etc.' '