diff options
Diffstat (limited to 't/t7608-merge-messages.sh')
| -rwxr-xr-x | t/t7608-merge-messages.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t7608-merge-messages.sh b/t/t7608-merge-messages.sh index 28d5679..9225fa6 100755 --- 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 |