1.1 --- a/it/figs/bad-merge-3.dot	Tue Aug 18 17:19:30 2009 +0200
     1.2 +++ b/it/figs/bad-merge-3.dot	Sat Jul 10 06:24:30 2010 +0100
     1.3 @@ -1,5 +1,5 @@
     1.4  digraph bad_merge_3 {
     1.5 -	ancestor [label="1: antenato",color="#bbbbbb",fontcolor="#bbbbbb"];
     1.6 +	ancestor [label="1: progenitore",color="#bbbbbb",fontcolor="#bbbbbb"];
     1.7  	left [label="2: mia modifica",color="#bbbbbb",fontcolor="#bbbbbb"];
     1.8  	right [label="3: vostra modifica",color="#bbbbbb",fontcolor="#bbbbbb"];
     1.9  	bad [label="4: unione sbagliata",color="#bbbbbb",fontcolor="#bbbbbb"];