checkout -m path: fix recreating conflicts

diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh
index 328444a3068f5083e3d64e92e88660c724acffdc..91b5aced1bcea74a66c3365e4aceff355d577f6a 100755 (executable)
--- a/t/t9300-fast-import.sh
+++ b/t/t9300-fast-import.sh
@@ -983,7 +983,7 @@ test_expect_success \
         git checkout subuse1 &&
         rm -rf sub && mkdir sub && cd sub &&
         git init &&
-        git fetch .. refs/heads/sub:refs/heads/master &&
+        git fetch --update-head-ok .. refs/heads/sub:refs/heads/master &&
         git checkout master &&
         cd .. &&
         git submodule init &&