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

diff --git a/t/t9106-git-svn-commit-diff-clobber.sh b/t/t9106-git-svn-commit-diff-clobber.sh
index f6d7ac7c5f67871ce332716561ea6aba7a6f920f..dbe8deac0d2f28099241957e8944e3f714ee2fde 100755 (executable)
--- a/t/t9106-git-svn-commit-diff-clobber.sh
+++ b/t/t9106-git-svn-commit-diff-clobber.sh
@@ -44,7 +44,7 @@ test_expect_success 'commit complementing change from git' '
 test_expect_success 'dcommit fails to commit because of conflict' '
        git svn init "$svnrepo" &&
        git svn fetch &&
-       git reset --hard refs/${remotes_git_svn} &&
+       git reset --hard refs/remotes/git-svn &&
        svn_cmd co "$svnrepo" t.svn &&
        (
                cd t.svn &&
@@ -59,7 +59,7 @@ test_expect_success 'dcommit fails to commit because of conflict' '
        '
 
 test_expect_success 'dcommit does the svn equivalent of an index merge' "
-       git reset --hard refs/${remotes_git_svn} &&
+       git reset --hard refs/remotes/git-svn &&
        echo 'index merge' > file2 &&
        git update-index --add file2 &&
        git commit -a -m 'index merge' &&
@@ -81,7 +81,7 @@ test_expect_success 'commit another change from svn side' '
        '
 
 test_expect_success 'multiple dcommit from git svn will not clobber svn' "
-       git reset --hard refs/${remotes_git_svn} &&
+       git reset --hard refs/remotes/git-svn &&
        echo new file >> new-file &&
        git update-index --add new-file &&
        git commit -a -m 'new file' &&