Source

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

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









digraph bad_merge_1 {
	ancestor [label="1: progenitore"];
	left [label="2: mia modifica"];
	right [label="3: vostra modifica"];
	bad [label="4: unione sbagliata"];
	new [label="5: nuova modifica"];

	ancestor -> left;
	ancestor -> right;
	left -> bad;
	right -> bad;
	bad -> new;
}