merge-octopus: abort if index does not match HEAD

diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index 51dd2b4e0e088c11bf359b32eddf353e58ca6d4d..4008faead8ec4ea0d08e82d2916dbc3e17327c8a 100755 (executable)
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@ -102,7 +102,7 @@ test_expect_success \
 
 test_expect_success \
     'adding another file' \
-    'cp "$TEST_DIRECTORY"/../README path0/README &&
+    'cp "$TEST_DIRECTORY"/../README.md path0/README &&
      git add path0/README &&
      git commit -m add2 -a'