Mercurial > hgbook

diff en/figs/bad-merge-1.dot @ 807:7226e5e750a6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Clean up chapter 8, and add content
author Bryan O'Sullivan <bos@serpentine.com>
date Tue, 21 Apr 2009 23:49:27 -0700
parents
children
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/figs/bad-merge-1.dot	Tue Apr 21 23:49:27 2009 -0700
@@ -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;
+}