view en/undo-manual.dot @ 401:e281bd9a8e47

Fix sample output for test 'tour-merge-conflict'. Fix test itself as well (now requires 'hg resolve').

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