view en/undo-manual-merge.dot @ 503:1839fd383e50

translated a few subsections of intro

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