Merge branch 'sb/t4005-modernize' into maint

diff --git a/t/t7607-merge-overwrite.sh b/t/t7607-merge-overwrite.sh
index 1c5934994648642c6fafd20dcc288772c6585e4c..9444d6a9b9026748028178c4b66ee8bbbc1d89fa 100755 (executable)
--- a/t/t7607-merge-overwrite.sh
+++ b/t/t7607-merge-overwrite.sh
@@ -125,7 +125,7 @@ test_expect_success 'will not overwrite untracked file in leading path' '
        cp important sub &&
        cp important sub2 &&
        test_must_fail git merge sub 2>out &&
-       test_cmp out expect &&
+       test_i18ncmp out expect &&
        test_path_is_missing .git/MERGE_HEAD &&
        test_cmp important sub &&
        test_cmp important sub2 &&