diff options
| author | Michael J Gruber <git@drmicha.warpmail.net> | 2009-08-05 09:59:18 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-08-05 10:26:41 -0700 |
| commit | 30ca4ca7b25082574d93b3a6d46a966d39de0488 (patch) | |
| tree | b278b14771b9bd321ee95a15b76bf4f537f2f732 /t/t6010-merge-base.sh | |
| parent | b7da721f02638083cc3debfd9ae7221d76a96b26 (diff) | |
| download | git-30ca4ca7b25082574d93b3a6d46a966d39de0488.tar.gz | |
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 <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6010-merge-base.sh')
| -rwxr-xr-x | t/t6010-merge-base.sh | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/t/t6010-merge-base.sh b/t/t6010-merge-base.sh index 04e4b7c5c2..79124ec761 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 && |