Merge branch 'da/difftool-mergetool-simplify-reporting-status'

diff --git a/t/t5531-deep-submodule-push.sh b/t/t5531-deep-submodule-push.sh
index 8c16e045a0c585957a0be4e31b5628d1d5b6cb23..445bb5fe26a4d8edc29223b1216625d484cd01bf 100755 (executable)
--- a/t/t5531-deep-submodule-push.sh
+++ b/t/t5531-deep-submodule-push.sh
@@ -12,6 +12,7 @@ test_expect_success setup '
        (
                cd work &&
                git init &&
+               git config push.default matching &&
                mkdir -p gar/bage &&
                (
                        cd gar/bage &&