hgbook
annotate it/figs/bad-merge-1.dot @ 1024:ea04ebd452b5
French : second part of ch06
| author | André Sintzoff <andre.sintzoff@gmail.com> |
|---|---|
| date | Thu Dec 03 22:45:38 2009 +0100 (2009-12-03) |
| parents | 713f0f69029a 793e15b562ef |
| children |
| 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 } |