merge-recursive: Save D/F conflict filenames instead of unlinking them

diff --git a/t/t1200-tutorial.sh b/t/t1200-tutorial.sh
index 3264fefbad8b941bd90b243948f618b65fe4929f..5e29e13782ffad74915128adf163d57eef16f4e8 100755 (executable)
--- a/t/t1200-tutorial.sh
+++ b/t/t1200-tutorial.sh
@@ -166,8 +166,8 @@ test_expect_success 'git resolve' '
                -e "s/^Fast[- ]forward /FASTFORWARD /" >resolve.output
 '
 
-test_expect_success C_LOCALE_OUTPUT 'git resolve output' '
-       test_cmp resolve.expect resolve.output
+test_expect_success 'git resolve output' '
+       test_i18ncmp resolve.expect resolve.output
 '
 
 cat > show-branch2.expect << EOF