hgbook
view it/figs/bad-merge-1.dot @ 998:9d32b10fdb1e
updating .hgignore to ignore the same files other translation ignores
| author | Romain PELISSE <belaran@gmail.com> |
|---|---|
| date | Sat Sep 12 20:52:35 2009 +0200 (2009-09-12) |
| parents | 713f0f69029a 793e15b562ef |
| children |
line source
1 digraph bad_merge_1 {
2 ancestor [label="1: progenitore"];
3 left [label="2: mia modifica"];
4 right [label="3: vostra modifica"];
5 bad [label="4: unione sbagliata"];
6 new [label="5: nuova modifica"];
8 ancestor -> left;
9 ancestor -> right;
10 left -> bad;
11 right -> bad;
12 bad -> new;
13 }