merge-recursive: make "CONFLICT (rename/delete)" message show both paths

diff --git a/t/t9123-git-svn-rebuild-with-rewriteroot.sh b/t/t9123-git-svn-rebuild-with-rewriteroot.sh
index fd8184787fba13bbbf3f1ef377ad3f979ef8f47a..ead404589eb622edd30adda06ad9684517b7e1f4 100755 (executable)
--- a/t/t9123-git-svn-rebuild-with-rewriteroot.sh
+++ b/t/t9123-git-svn-rebuild-with-rewriteroot.sh
@@ -17,7 +17,7 @@ rm -rf import
 test_expect_success 'init, fetch and checkout repository' '
        git svn init --rewrite-root=http://invalid.invalid/ "$svnrepo" &&
        git svn fetch &&
-       git checkout -b mybranch ${remotes_git_svn}
+       git checkout -b mybranch remotes/git-svn
        '
 
 test_expect_success 'remove rev_map' '