X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft1507-rev-parse-upstream.sh;h=a4555510c37276d36387d4c5c818503bb286dbd1;hb=b1b7cedcfe351870d4c56f664695a25f8651d5b3;hp=8c8dfdaf9f037f370629f419af02aa7a9d75f613;hpb=71ee7fd15457a0252c089420b5b66de266dcbd2f;p=git.git diff --git a/t/t1507-rev-parse-upstream.sh b/t/t1507-rev-parse-upstream.sh index 8c8dfdaf9..a4555510c 100755 --- a/t/t1507-rev-parse-upstream.sh +++ b/t/t1507-rev-parse-upstream.sh @@ -85,7 +85,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=format:%s >actual && - echo "Merge remote branch ${sq}origin/side${sq}" >expect && + echo "Merge remote-tracking branch ${sq}origin/side${sq}" >expect && test_cmp expect actual ) '