view en/figs/undo-manual-merge.dot @ 836:d819bc2414f4

add figs/bad-merge-*.dot. a part of 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";
}