Source

hgbook-it / it / figs / bad-merge-4.dot

Full commit
Giu...@puck ea5ae4d 
gpiancastelli 793e15b 
Giu...@puck ea5ae4d 






















digraph bad_merge_4 {
	ancestor [label="1: progenitore",color="#bbbbbb",fontcolor="#bbbbbb"];
	left [label="2: mia modifica",color="#bbbbbb",fontcolor="#bbbbbb"];
	right [label="3: vostra modifica",color="#bbbbbb",fontcolor="#bbbbbb"];
	bad [label="4: unione sbagliata",color="#bbbbbb",fontcolor="#bbbbbb"];
	new [label="5: nuova modifica",color="#bbbbbb",fontcolor="#bbbbbb"];

	bak_left [label="6: ritiro n°1 della\nunione sbagliata",color=grey,fontcolor=grey,shape=box];
	bak_right [label="7: ritiro n°2 della\nunione sbagliata",color=grey,fontcolor=grey,shape=box];
	good [label="8: unione\ndei ritiri",shape=box];

	ancestor -> left [color="#bbbbbb"];
	ancestor -> right [color="#bbbbbb"];
	left -> bad [color="#bbbbbb"];
	right -> bad [color="#bbbbbb"];
	bad -> new [color="#bbbbbb"];

	bad -> bak_left [color=grey];
	left -> bak_left [style=dotted,label="--parent=2",color=grey,fontcolor=grey];

	bad -> bak_right [color=grey];
	right -> bak_right [style=dotted,label="--parent=3",color=grey,fontcolor=grey];

	bak_left -> good;
	bak_right -> good;
}