hgbook
annotate it/figs/bad-merge-1.dot @ 1085:b71b3f734904
2.4.2 first para unfinished
| author | Zhaoping Sun <zhaopingsun@gmail.com> |
|---|---|
| date | Fri Nov 20 23:21:46 2009 -0500 (2009-11-20) |
| parents | ea5ae4dd787b |
| children | 719b03ea27c8 |
| rev | line source |
|---|---|
| Giulio@832 | 1 digraph bad_merge_1 { |
| gpiancastelli@844 | 2 ancestor [label="1: progenitore"]; |
| Giulio@832 | 3 left [label="2: mia modifica"]; |
| Giulio@832 | 4 right [label="3: vostra modifica"]; |
| Giulio@832 | 5 bad [label="4: unione sbagliata"]; |
| Giulio@832 | 6 new [label="5: nuova modifica"]; |
| Giulio@832 | 7 |
| Giulio@832 | 8 ancestor -> left; |
| Giulio@832 | 9 ancestor -> right; |
| Giulio@832 | 10 left -> bad; |
| Giulio@832 | 11 right -> bad; |
| Giulio@832 | 12 bad -> new; |
| Giulio@832 | 13 } |