merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir

diff --git a/t/t9146-git-svn-empty-dirs.sh b/t/t9146-git-svn-empty-dirs.sh
index 3f2d7198270f0ad4bcb4d1082a0b452e37a53f05..565365cbd3ff80d816dd02b2072045cd25ae4b93 100755 (executable)
--- a/t/t9146-git-svn-empty-dirs.sh
+++ b/t/t9146-git-svn-empty-dirs.sh
@@ -122,7 +122,7 @@ test_expect_success 'git svn gc-ed files work' '
                : Compress::Zlib may not be available &&
                if test -f "$unhandled".gz
                then
-                       svn mkdir -m gz "$svnrepo"/gz &&
+                       svn_cmd mkdir -m gz "$svnrepo"/gz &&
                        git reset --hard $(git rev-list HEAD | tail -1) &&
                        git svn rebase &&
                        test -f "$unhandled".gz &&