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

Clean up chapter 8, and add content

807:7226e5e750a6

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;
}