X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft4202-log.sh;h=222f7559e92caa2a0bbd128b0bb6bac14e2e113f;hb=a734e7ef6c14d8eb476fe8b2d6f861b3ed2c211d;hp=983e34bec67a4cc4ba1182332e495377cc879ac9;hpb=7fc1495b1800f5207b634140ed66f7037e7f4bff;p=git.git 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