merge-recursive: Improve handling of rename target vs. directory addition

diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
index 5463f87e6864eca224d63ede6b3a246924689cc6..2d4ed206e122f78dac05daf51da4446a24181301 100755 (executable)
--- a/t/t7600-merge.sh
+++ b/t/t7600-merge.sh
@@ -527,10 +527,10 @@ test_expect_success 'merge fast-forward in a dirty tree' '
 
 test_debug 'git log --graph --decorate --oneline --all'
 
-test_expect_success C_LOCALE_OUTPUT 'in-index merge' '
+test_expect_success 'in-index merge' '
        git reset --hard c0 &&
        git merge --no-ff -s resolve c1 >out &&
-       grep "Wonderful." out &&
+       test_i18ngrep "Wonderful." out &&
        verify_parents $c0 $c1
 '