hgbook
annotate fr/figs/bad-merge-1.dot @ 1014:4650cddc0c27
some typo and better french translation
| author | André Sintzoff <andre.sintzoff@gmail.com> |
|---|---|
| date | Tue Nov 24 14:13:03 2009 +0100 (2009-11-24) |
| parents | 7226e5e750a6 |
| children |
| rev | line source |
|---|---|
| bos@680 | 1 digraph bad_merge_1 { |
| bos@680 | 2 ancestor [label="1: ancestor"]; |
| bos@680 | 3 left [label="2: my change"]; |
| bos@680 | 4 right [label="3: your change"]; |
| bos@680 | 5 bad [label="4: bad merge"]; |
| bos@680 | 6 new [label="5: new change"]; |
| bos@680 | 7 |
| bos@680 | 8 ancestor -> left; |
| bos@680 | 9 ancestor -> right; |
| bos@680 | 10 left -> bad; |
| bos@680 | 11 right -> bad; |
| bos@680 | 12 bad -> new; |
| bos@680 | 13 } |