hgbook
view en/figs/bad-merge-2.dot @ 1086:8ce6c7a3ebd2
2.4.3 zh translated finished
| author | Zhaoping Sun <zhaopingsun@gmail.com> |
|---|---|
| date | Fri Nov 20 08:03:26 2009 -0500 (2009-11-20) |
| parents | |
| children |
line source
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];
8 bak_left [label="6: backout 1 of\nbad merge",shape=box];
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];
16 bad -> bak_left;
17 left -> bak_left [style=dotted,label="--parent=2"];
18 }