view ja/figs/undo-manual-merge.dot @ 837:b775f963b18c

Clean up chapter 8, and add content propagate 7226e5e750a6

digraph undo_manual {
	"first change" -> "second change";
	"second change" -> "third change";
	backout [label="back out\nsecond change", shape=box];
	"second change" -> backout;
	"third change" -> "manual\nmerge";
	backout -> "manual\nmerge";
}