Merge branch 'sk/windows-unc-path'

diff --git a/t/t6039-merge-ignorecase.sh b/t/t6039-merge-ignorecase.sh
index dfc9f17a2d6f80bbc40bfc65605e7240559df01b..a97765314739be68cdd82e0b6f8dadd12f10a0a4 100755 (executable)
--- a/t/t6039-merge-ignorecase.sh
+++ b/t/t6039-merge-ignorecase.sh
@@ -35,7 +35,7 @@ test_expect_success 'merge with case-changing rename on both sides' '
        git reset --hard baseline &&
        git branch -D with-camel &&
        git checkout -b with-camel &&
-       git mv --force TestCase testcase &&
+       git mv TestCase testcase &&
        git commit -m "recase on branch" &&
        >foo &&
        git add foo &&