Giulio@832: digraph bad_merge_1 { gpiancastelli@844: ancestor [label="1: progenitore"]; Giulio@832: left [label="2: mia modifica"]; Giulio@832: right [label="3: vostra modifica"]; Giulio@832: bad [label="4: unione sbagliata"]; Giulio@832: new [label="5: nuova modifica"]; Giulio@832: Giulio@832: ancestor -> left; Giulio@832: ancestor -> right; Giulio@832: left -> bad; Giulio@832: right -> bad; Giulio@832: bad -> new; Giulio@832: }