Philip Oakley [off-list ref] writes:
On 09/06/2020 01:03, Chris Torek via GitGitGadget wrote:
[snip]
quoted
+test_description='behavior of diff with symmetric-diff setups'
+
+. ./test-lib.sh
+
+# build these situations:
+# - normal merge with one merge base (b1...b2);
+# - criss-cross merge ie 2 merge bases (b1...master);
+# - disjoint subgraph (orphan branch, b3...master).
nit:
Use of b1, b2, b3 here, but br1, br2, br3 below
quoted
+#
+# B---E <-- master
+# / \ /
+# A X
+# \ / \
+# C---D--G <-- br1
+# \ /
+# ---F <-- br2
+#
+# H <-- br3
+#
True. Which one is to be recommended? The shorter and sweeter b1,
b2 and b3?
In any case, that must match the topology used by the tests.
Thanks.