Merge branch 'rj/maint-difftool-cygwin-workaround'

diff --git a/t/t9124-git-svn-dcommit-auto-props.sh b/t/t9124-git-svn-dcommit-auto-props.sh
index d6b076f6b7de148c8d548c7a977e4f09b4be8e3b..aa841e12996aad8cd7284eea56c47f0d89c79c56 100755 (executable)
--- a/t/t9124-git-svn-dcommit-auto-props.sh
+++ b/t/t9124-git-svn-dcommit-auto-props.sh
@@ -24,7 +24,7 @@ test_expect_success 'initialize git svn' '
                svn_cmd import -m "import for git svn" . "$svnrepo"
        ) &&
        rm -rf import &&
-       git svn init "$svnrepo"
+       git svn init "$svnrepo" &&
        git svn fetch
 '