merge-file: correctly find files when called in subdir

diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh
index 1382a8e58a14c8fcc92889aad492d5883fd64f2b..bfb4975e940e29edf3b06e5c074b8e963cfbbdcf 100755 (executable)
--- a/t/t7406-submodule-update.sh
+++ b/t/t7406-submodule-update.sh
@@ -25,7 +25,7 @@ test_expect_success 'setup a submodule tree' '
        echo file > file &&
        git add file &&
        test_tick &&
-       git commit -m upstream
+       git commit -m upstream &&
        git clone . super &&
        git clone super submodule &&
        git clone super rebasing &&