mergetool--lib: Allow custom commands to override built-ins

diff --git a/t/t9142-git-svn-shallow-clone.sh b/t/t9142-git-svn-shallow-clone.sh
index 1236accd993d5bc1a80fbda720ce229f8e93940c..e21ee5f663ce8333625c5d9d483c42dde3394675 100755 (executable)
--- a/t/t9142-git-svn-shallow-clone.sh
+++ b/t/t9142-git-svn-shallow-clone.sh
@@ -17,11 +17,10 @@ test_expect_success 'setup test repository' '
                > foo &&
                svn_cmd add foo &&
                svn_cmd commit -m "add foo"
-       )
+       ) &&
+       start_httpd
 '
 
-start_httpd
-
 test_expect_success 'clone trunk with "-r HEAD"' '
        git svn clone -r HEAD "$svnrepo/trunk" g &&
        ( cd g && git rev-parse --symbolic --verify HEAD )