Merge git://ozlabs.org/~paulus/gitk

[thirdparty/git.git] / t / t6042-merge-rename-corner-cases.sh

diff --git a/t/t6042-merge-rename-corner-cases.sh b/t/t6042-merge-rename-corner-cases.sh
index 7cc34e75797b406096407ba1799a1ca54e48333c..09dfa8bd92b51e7a90fcd01f07c62a6fdf65a528 100755 (executable)
--- a/t/t6042-merge-rename-corner-cases.sh
+++ b/t/t6042-merge-rename-corner-cases.sh
@@ -1175,7 +1175,7 @@ test_expect_success 'setup nested conflicts from rename/rename(2to1)' '
 
                # Handle the left side
                git checkout L &&
-               git mv one three &&
+               git rm one two &&
                mv -f file_v2 three &&
                mv -f file_v5 two &&
                git add two three &&
@@ -1183,7 +1183,7 @@ test_expect_success 'setup nested conflicts from rename/rename(2to1)' '
 
                # Handle the right side
                git checkout R &&
-               git mv two three &&
+               git rm one two &&
                mv -f file_v3 one &&
                mv -f file_v6 three &&
                git add one three &&