t6042: Add failing testcases for rename/rename/add-{source,dest} conflicts

diff --git a/t/t7607-merge-overwrite.sh b/t/t7607-merge-overwrite.sh
index b54e840ee2ab09a67afc663a2f475bfc9fcb9d8b..72a8731d5e28d71577d0c53fc25a5ddc1d2ad6de 100755 (executable)
--- a/t/t7607-merge-overwrite.sh
+++ b/t/t7607-merge-overwrite.sh
@@ -150,9 +150,12 @@ test_expect_success 'will not overwrite untracked file on unborn branch' '
        git rm -fr . &&
        git checkout --orphan new &&
        cp important c0.c &&
-       test_when_finished "rm c0.c" &&
        test_must_fail git merge c0 2>out &&
-       test_cmp out expect &&
+       test_i18ncmp out expect
+'
+
+test_expect_success 'will not overwrite untracked file on unborn branch .git/MERGE_HEAD sanity etc.' '
+       test_when_finished "rm c0.c" &&
        test_path_is_missing .git/MERGE_HEAD &&
        test_cmp important c0.c
 '