Mercurial > hgbook

diff ja/figs/bad-merge-1.dot @ 836:d819bc2414f4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add figs/bad-merge-*.dot. a part of 7226e5e750a6.
author Yoshiki Yazawa <yaz@honeyplanet.jp>
date Thu, 23 Jul 2009 18:10:58 +0900
parents en/figs/bad-merge-1.dot@7226e5e750a6
children
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ja/figs/bad-merge-1.dot	Thu Jul 23 18:10:58 2009 +0900
@@ -0,0 +1,13 @@
+digraph bad_merge_1 {
+	ancestor [label="1: ancestor"];
+	left [label="2: my change"];
+	right [label="3: your change"];
+	bad [label="4: bad merge"];
+	new [label="5: new change"];
+
+	ancestor -> left;
+	ancestor -> right;
+	left -> bad;
+	right -> bad;
+	bad -> new;
+}