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