merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir

diff --git a/t/t7003-filter-branch.sh b/t/t7003-filter-branch.sh
index fd7e3a113c9e3fcedc1c18c0b1a87a2c0ffef15b..2c55801ee8b88b2d97968a24706dcfdab824668b 100755 (executable)
--- a/t/t7003-filter-branch.sh
+++ b/t/t7003-filter-branch.sh
@@ -143,7 +143,7 @@ test_expect_success 'more setup' '
 test_expect_success 'use index-filter to move into a subdirectory' '
        git branch directorymoved &&
        git filter-branch -f --index-filter \
-                "git ls-files -s | sed \"s-\\t-&newsubdir/-\" |
+                "git ls-files -s | sed \"s-    -&newsubdir/-\" |
                  GIT_INDEX_FILE=\$GIT_INDEX_FILE.new \
                        git update-index --index-info &&
                  mv \"\$GIT_INDEX_FILE.new\" \"\$GIT_INDEX_FILE\"" directorymoved &&