diff --git a/t/t4202-log.sh b/t/t4202-log.sh
index b98619035c58d1b5c617c6e9998e7ae07ab3f27f..64502e2be762a82b65a72af6847d5a3b79303d45 100755 (executable)
--- a/t/t4202-log.sh
+++ b/t/t4202-log.sh
git merge master~3 &&
git merge side~1 &&
git checkout master &&
- git merge tangle
+ git merge tangle &&
+ git checkout -b reach &&
+ test_commit reach &&
+ git checkout master &&
+ git checkout -b octopus-a &&
+ test_commit octopus-a &&
+ git checkout master &&
+ git checkout -b octopus-b &&
+ test_commit octopus-b &&
+ git checkout master &&
+ test_commit seventh &&
+ git merge octopus-a octopus-b
+ git merge reach
'
cat > expect <<\EOF
+* Merge branch 'reach'
+|\
+| \
+| \
+*-. \ Merge branches 'octopus-a' and 'octopus-b'
+|\ \ \
+* | | | seventh
+| | * | octopus-b
+| |/ /
+|/| |
+| * | octopus-a
+|/ /
+| * reach
+|/
* Merge branch 'tangle'
|\
| * Merge branch 'side' (early part) into tangle