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

Clean up chapter 8, and add content

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/figs/bad-merge-2.dot	Tue Apr 21 23:49:27 2009 -0700
@@ -0,0 +1,18 @@
+digraph bad_merge_2 {
+	ancestor [label="1: ancestor",color=grey,fontcolor=grey];
+	left [label="2: my change",color=grey,fontcolor=grey];
+	right [label="3: your change",color=grey,fontcolor=grey];
+	bad [label="4: bad merge",color=grey,fontcolor=grey];
+	new [label="5: new change",color=grey,fontcolor=grey];
+
+	bak_left [label="6: backout 1 of\nbad merge",shape=box];
+
+	ancestor -> left [color=grey];
+	ancestor -> right [color=grey];
+	left -> bad [color=grey];
+	right -> bad [color=grey];
+	bad -> new [color=grey];
+
+	bad -> bak_left;
+	left -> bak_left [style=dotted,label="--parent=2"];
+}