diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-11-04 21:31:28 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-11-07 14:06:39 -0800 |
| commit | 57b58db74c3272ac13d5d201ecedf6483b34cdfe (patch) | |
| tree | b530170fcf23a0ebd9a02e01ffb63c41d0a6b3fe /t/t4202-log.sh | |
| parent | 7a2b128d13d880635e7317a9208cfa42a660f143 (diff) | |
| download | git-57b58db74c3272ac13d5d201ecedf6483b34cdfe.tar.gz git-57b58db74c3272ac13d5d201ecedf6483b34cdfe.tar.xz | |
merge: notice local merging of tags and keep it unwrapped
This also updates the autogenerated merge title message from "merge commit X"
to "merge tag X", and its effect can be seen in the changes to the test suite.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4202-log.sh')
| -rwxr-xr-x | t/t4202-log.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t4202-log.sh b/t/t4202-log.sh index 983e34bec..222f7559e 100755 --- a/t/t4202-log.sh +++ b/t/t4202-log.sh @@ -346,11 +346,11 @@ test_expect_success 'set up more tangled history' ' ' cat > expect <<\EOF -* Merge commit 'reach' +* Merge tag 'reach' |\ | \ | \ -*-. \ Merge commit 'octopus-a'; commit 'octopus-b' +*-. \ Merge tags 'octopus-a' and 'octopus-b' |\ \ \ * | | | seventh | | * | octopus-b |