hgbook

view it/figs/bad-merge-1.dot @ 839:0a49072e8c7f

find changesets by author, revision, files, or words in the commit message
Final editing for chapters 4-7.
author gpiancastelli
date Fri Aug 21 21:42:22 2009 +0200 (2009-08-21)
parents
children 793e15b562ef
line source
1 digraph bad_merge_1 {
2 ancestor [label="1: antenato"];
3 left [label="2: mia modifica"];
4 right [label="3: vostra modifica"];
5 bad [label="4: unione sbagliata"];
6 new [label="5: nuova modifica"];
7
8 ancestor -> left;
9 ancestor -> right;
10 left -> bad;
11 right -> bad;
12 bad -> new;
13 }