hgbook
view it/figs/bad-merge-1.dot @ 1105:9c84da5d93e9
2.8.2 4 paras zh translated
| author | Zhaoping Sun <zhaopingsun@gmail.com> |
|---|---|
| date | Tue Dec 01 23:40:47 2009 -0500 (2009-12-01) |
| parents | ea5ae4dd787b |
| children | 719b03ea27c8 |
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 }