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>
Michael J Gruber committed
Aug 5, 2009 at 09:59 UTC
30ca4ca7b25082574d93b3a6d46a966d39de0488
1 file changed
+12
t/t6010-merge-base.sh
+12
@@ -110,6 +110,18 @@ test_expect_success 'compute merge-base (all)' \
110
111
# Another set to demonstrate base between one commit and a merge
112
# in the documentation.
113
+#
114
+# * C (MMC) * B (MMB) * A (MMA)
115
+# * o * o * o
116
+# * o * o * o
117
+# * o * o * o
118
+# * o | _______/
119
+# | |/
120
+# | * 1 (MM1)
121
+# | _______/
122
+# |/
123
+# * root (MMR)
124
+
125
126
test_expect_success 'merge-base for octopus-step (setup)' '
127
test_tick && git commit --allow-empty -m root && git tag MMR &&