Source

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

Diff from to

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

 digraph bad_merge_4 {
-	ancestor [label="1: antenato",color="#bbbbbb",fontcolor="#bbbbbb"];
+	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"];