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

diff --git a/t/t9111-git-svn-use-svnsync-props.sh b/t/t9111-git-svn-use-svnsync-props.sh
index bd081c2ec39686196e7b2873610df9a6466355b3..22b6e5ee7d8c274b7fe60c9f10de45eaf4d3c385 100755 (executable)
--- a/t/t9111-git-svn-use-svnsync-props.sh
+++ b/t/t9111-git-svn-use-svnsync-props.sh
@@ -21,31 +21,31 @@ uuid=161ce429-a9dd-4828-af4a-52023f968c89
 bar_url=http://mayonaise/svnrepo/bar
 test_expect_success 'verify metadata for /bar' "
        git cat-file commit refs/remotes/bar | \
-          grep '^${git_svn_id}: $bar_url@12 $uuid$' &&
+          grep '^git-svn-id: $bar_url@12 $uuid$' &&
        git cat-file commit refs/remotes/bar~1 | \
-          grep '^${git_svn_id}: $bar_url@11 $uuid$' &&
+          grep '^git-svn-id: $bar_url@11 $uuid$' &&
        git cat-file commit refs/remotes/bar~2 | \
-          grep '^${git_svn_id}: $bar_url@10 $uuid$' &&
+          grep '^git-svn-id: $bar_url@10 $uuid$' &&
        git cat-file commit refs/remotes/bar~3 | \
-          grep '^${git_svn_id}: $bar_url@9 $uuid$' &&
+          grep '^git-svn-id: $bar_url@9 $uuid$' &&
        git cat-file commit refs/remotes/bar~4 | \
-          grep '^${git_svn_id}: $bar_url@6 $uuid$' &&
+          grep '^git-svn-id: $bar_url@6 $uuid$' &&
        git cat-file commit refs/remotes/bar~5 | \
-          grep '^${git_svn_id}: $bar_url@1 $uuid$'
+          grep '^git-svn-id: $bar_url@1 $uuid$'
        "
 
 e_url=http://mayonaise/svnrepo/dir/a/b/c/d/e
 test_expect_success 'verify metadata for /dir/a/b/c/d/e' "
        git cat-file commit refs/remotes/e | \
-          grep '^${git_svn_id}: $e_url@1 $uuid$'
+          grep '^git-svn-id: $e_url@1 $uuid$'
        "
 
 dir_url=http://mayonaise/svnrepo/dir
 test_expect_success 'verify metadata for /dir' "
        git cat-file commit refs/remotes/dir | \
-          grep '^${git_svn_id}: $dir_url@2 $uuid$' &&
+          grep '^git-svn-id: $dir_url@2 $uuid$' &&
        git cat-file commit refs/remotes/dir~1 | \
-          grep '^${git_svn_id}: $dir_url@1 $uuid$'
+          grep '^git-svn-id: $dir_url@1 $uuid$'
        "
 
 test_done