hgbook
annotate en/figs/bad-merge-1.dot @ 705:d5688822c51d
Preface, now with actual text
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Thu May 07 22:32:55 2009 -0700 (2009-05-07) |
| parents | |
| 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 } |