t6010-merge-base.sh: Depict the octopus test graph
authorMichael J Gruber <git@drmicha.warpmail.net>
Wed, 5 Aug 2009 07:59:18 +0000 (09:59 +0200)
committerJunio C Hamano <gitster@pobox.com>
Wed, 5 Aug 2009 17:26:41 +0000 (10:26 -0700)
...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>
t/t6010-merge-base.sh

index 04e4b7c5c2aa4f7c6922ebc5c9236962ab5d175c..79124ec761a90fd0e2f028b4566fd21947ba5490 100755 (executable)
@@ -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 &&