Merge branch 'js/default-branch-name'

[thirdparty/git.git] / t / t1507-rev-parse-upstream.sh

diff --git a/t/t1507-rev-parse-upstream.sh b/t/t1507-rev-parse-upstream.sh
index dfc0d96d8a8a834743781a08a8ea1c5f9dd63bda..f213aa8053807882e7312a5b9cb8efd252dfae35 100755 (executable)
--- a/t/t1507-rev-parse-upstream.sh
+++ b/t/t1507-rev-parse-upstream.sh
@@ -137,7 +137,7 @@ test_expect_success 'merge my-side@{u} records the correct name' '
        git branch -t new my-side@{u} &&
        git merge -s ours new@{u} &&
        git show -s --pretty=tformat:%s >actual &&
-       echo "Merge remote-tracking branch ${SQ}origin/side${SQ}" >expect &&
+       echo "Merge remote-tracking branch ${SQ}origin/side${SQ} into master" >expect &&
        test_cmp expect actual
 )
 '