Mercurial > hgbook
annotate en/figs/bad-merge-1.dot @ 838:d1f676a6a4b3 default tip
update mq chapter.
propagate ef53d025f410.
author | Yoshiki Yazawa <yaz@honeyplanet.jp> |
---|---|
date | Thu, 03 Dec 2009 01:26:08 +0900 |
parents | 7226e5e750a6 |
children |
rev | line source |
---|---|
807
7226e5e750a6
Clean up chapter 8, and add content
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
1 digraph bad_merge_1 { |
7226e5e750a6
Clean up chapter 8, and add content
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
2 ancestor [label="1: ancestor"]; |
7226e5e750a6
Clean up chapter 8, and add content
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
3 left [label="2: my change"]; |
7226e5e750a6
Clean up chapter 8, and add content
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
4 right [label="3: your change"]; |
7226e5e750a6
Clean up chapter 8, and add content
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
5 bad [label="4: bad merge"]; |
7226e5e750a6
Clean up chapter 8, and add content
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
6 new [label="5: new change"]; |
7226e5e750a6
Clean up chapter 8, and add content
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
7 |
7226e5e750a6
Clean up chapter 8, and add content
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
8 ancestor -> left; |
7226e5e750a6
Clean up chapter 8, and add content
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
9 ancestor -> right; |
7226e5e750a6
Clean up chapter 8, and add content
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
10 left -> bad; |
7226e5e750a6
Clean up chapter 8, and add content
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
11 right -> bad; |
7226e5e750a6
Clean up chapter 8, and add content
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
12 bad -> new; |
7226e5e750a6
Clean up chapter 8, and add content
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
13 } |