Merge branch 'jk/mergetool'

diff --git a/t/t9155-git-svn-fetch-deleted-tag.sh b/t/t9155-git-svn-fetch-deleted-tag.sh
index ef0ac8779eda28efba97664b5cedd85c464553f1..a486a98f84e741d6f16da55bfc537abdacb9a58f 100755 (executable)
--- a/t/t9155-git-svn-fetch-deleted-tag.sh
+++ b/t/t9155-git-svn-fetch-deleted-tag.sh
@@ -12,7 +12,7 @@ test_expect_success 'setup svn repo' '
        svn_cmd import -m "import for git svn" import "$svnrepo" &&
        rm -rf import &&
 
-       svn_cmd mkdir --parents -m "create mybranch directory" "$svnrepo/branches/mybranch" &&
+       svn_cmd mkdir -m "create mybranch directory" "$svnrepo/branches/mybranch" &&
        svn_cmd cp -m "create branch mybranch" "$svnrepo/trunk" "$svnrepo/branches/mybranch/trunk" &&
 
        svn_cmd co "$svnrepo/trunk" svn_project &&