From 30ca4ca7b25082574d93b3a6d46a966d39de0488 Mon Sep 17 00:00:00 2001 From: Michael J Gruber Date: Wed, 5 Aug 2009 09:59:18 +0200 Subject: [PATCH] t6010-merge-base.sh: Depict the octopus test graph ...so that it is easier to reuse it for other tests. Signed-off-by: Michael J Gruber Signed-off-by: Junio C Hamano --- t/t6010-merge-base.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/t/t6010-merge-base.sh b/t/t6010-merge-base.sh index 04e4b7c5c..79124ec76 100755 --- a/t/t6010-merge-base.sh +++ b/t/t6010-merge-base.sh @@ -110,6 +110,18 @@ test_expect_success 'compute merge-base (all)' \ # Another set to demonstrate base between one commit and a merge # in the documentation. +# +# * C (MMC) * B (MMB) * A (MMA) +# * o * o * o +# * o * o * o +# * o * o * o +# * o | _______/ +# | |/ +# | * 1 (MM1) +# | _______/ +# |/ +# * root (MMR) + test_expect_success 'merge-base for octopus-step (setup)' ' test_tick && git commit --allow-empty -m root && git tag MMR && -- 2.26.2