merge-recursive: Save D/F conflict filenames instead of unlinking them

diff --git a/t/t9157-git-svn-fetch-merge.sh b/t/t9157-git-svn-fetch-merge.sh
index accf61eb03c482e72cef7c8810c47bef5b985394..991d2aa1be63c2440db93e6237201383e28a498a 100755 (executable)
--- a/t/t9157-git-svn-fetch-merge.sh
+++ b/t/t9157-git-svn-fetch-merge.sh
@@ -8,7 +8,7 @@ test_description='git svn merge detection'
 
 svn_ver="$(svn --version --quiet)"
 case $svn_ver in
-[0-1].[0-4].[0-6])
+0.* | 1.[0-4].*)
        skip_all="skipping git-svn test - SVN too old ($svn_ver)"
        test_done
        ;;