1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/en/figs/bad-merge-2.dot	Mon Aug 10 19:07:10 2009 +0200
     1.3 @@ -0,0 +1,18 @@
     1.4 +digraph bad_merge_2 {
     1.5 +	ancestor [label="1: ancestor",color=grey,fontcolor=grey];
     1.6 +	left [label="2: my change",color=grey,fontcolor=grey];
     1.7 +	right [label="3: your change",color=grey,fontcolor=grey];
     1.8 +	bad [label="4: bad merge",color=grey,fontcolor=grey];
     1.9 +	new [label="5: new change",color=grey,fontcolor=grey];
    1.10 +
    1.11 +	bak_left [label="6: backout 1 of\nbad merge",shape=box];
    1.12 +
    1.13 +	ancestor -> left [color=grey];
    1.14 +	ancestor -> right [color=grey];
    1.15 +	left -> bad [color=grey];
    1.16 +	right -> bad [color=grey];
    1.17 +	bad -> new [color=grey];
    1.18 +
    1.19 +	bad -> bak_left;
    1.20 +	left -> bak_left [style=dotted,label="--parent=2"];
    1.21 +}