bos@680: digraph bad_merge_2 {
bos@680: 	ancestor [label="1: ancestor",color=grey,fontcolor=grey];
bos@680: 	left [label="2: my change",color=grey,fontcolor=grey];
bos@680: 	right [label="3: your change",color=grey,fontcolor=grey];
bos@680: 	bad [label="4: bad merge",color=grey,fontcolor=grey];
bos@680: 	new [label="5: new change",color=grey,fontcolor=grey];
bos@680: 
bos@680: 	bak_left [label="6: backout 1 of\nbad merge",shape=box];
bos@680: 
bos@680: 	ancestor -> left [color=grey];
bos@680: 	ancestor -> right [color=grey];
bos@680: 	left -> bad [color=grey];
bos@680: 	right -> bad [color=grey];
bos@680: 	bad -> new [color=grey];
bos@680: 
bos@680: 	bad -> bak_left;
bos@680: 	left -> bak_left [style=dotted,label="--parent=2"];
bos@680: }