Mercurial > hgbook
comparison en/figs/bad-merge-2.dot @ 807:7226e5e750a6
Clean up chapter 8, and add content
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Tue, 21 Apr 2009 23:49:27 -0700 |
parents | |
children |
comparison
equal
deleted
inserted
replaced
806:06458701453c | 807:7226e5e750a6 |
---|---|
1 digraph bad_merge_2 { | |
2 ancestor [label="1: ancestor",color=grey,fontcolor=grey]; | |
3 left [label="2: my change",color=grey,fontcolor=grey]; | |
4 right [label="3: your change",color=grey,fontcolor=grey]; | |
5 bad [label="4: bad merge",color=grey,fontcolor=grey]; | |
6 new [label="5: new change",color=grey,fontcolor=grey]; | |
7 | |
8 bak_left [label="6: backout 1 of\nbad merge",shape=box]; | |
9 | |
10 ancestor -> left [color=grey]; | |
11 ancestor -> right [color=grey]; | |
12 left -> bad [color=grey]; | |
13 right -> bad [color=grey]; | |
14 bad -> new [color=grey]; | |
15 | |
16 bad -> bak_left; | |
17 left -> bak_left [style=dotted,label="--parent=2"]; | |
18 } |