Default GIT_MERGE_VERBOSITY to 5 during tests.

diff --git a/t/t5400-send-pack.sh b/t/t5400-send-pack.sh
index 2c151912a3bcf2c91cfafcbc22f11bc71fedd34d..7d93d0d7c90de94b0972d8fa5cd6d747c3fd2f56 100755 (executable)
--- a/t/t5400-send-pack.sh
+++ b/t/t5400-send-pack.sh
@@ -106,7 +106,7 @@ export HOME ;# this way we force the victim/.git/config to be used.
 test_expect_success \
         'pushing with --force should be denied with denyNonFastforwards' '
        cd victim &&
-       git-repo-config receive.denyNonFastforwards true &&
+       git-config receive.denyNonFastforwards true &&
        cd .. &&
        git-update-ref refs/heads/master master^ &&
        git-send-pack --force ./victim/.git/ master &&