Merge branch 'hv/submodule-find-ff-merge'

diff --git a/t/t4118-apply-empty-context.sh b/t/t4118-apply-empty-context.sh
index 314bc6e68dc6fa0f722f1b6eed39ce6c06e05c1c..65f2e4c3efb9ae5b5459e15df337e07201d78c38 100755 (executable)
--- a/t/t4118-apply-empty-context.sh
+++ b/t/t4118-apply-empty-context.sh
@@ -23,7 +23,7 @@ test_expect_success setup '
        cat file2 >file2.orig &&
        git add file1 file2 &&
        sed -e "/^B/d" <file1.orig >file1 &&
-       sed -e "/^[BQ]/d" <file2.orig >file2 &&
+       cat file1 > file2 &&
        echo Q | tr -d "\\012" >>file2 &&
        cat file1 >file1.mods &&
        cat file2 >file2.mods &&