git-svn: allow the mergeinfo property to be set

diff --git a/t/t7608-merge-messages.sh b/t/t7608-merge-messages.sh
index 28d56797b17d5b1426d6c7c36e37b956731f1dfd..9225fa6f025cd9586b46f30464a69ccb57ca6b2a 100755 (executable)
--- a/t/t7608-merge-messages.sh
+++ b/t/t7608-merge-messages.sh
@@ -47,14 +47,14 @@ test_expect_success 'ambiguous tag' '
        check_oneline "Merge commit QambiguousQ"
 '
 
-test_expect_success 'remote branch' '
+test_expect_success 'remote-tracking branch' '
        git checkout -b remote master &&
        test_commit remote-1 &&
        git update-ref refs/remotes/origin/master remote &&
        git checkout master &&
        test_commit master-5 &&
        git merge origin/master &&
-       check_oneline "Merge remote branch Qorigin/masterQ"
+       check_oneline "Merge remote-tracking branch Qorigin/masterQ"
 '
 
 test_done