hgbook

view en/figs/bad-merge-2.dot @ 1114:527b86d55d4a

find changesets by author, revision, files, or words in the commit message
inotify: update installation information

inotify is shipped in Mercurial since 1.0, which greatly simplifies the installation process
author Nicolas Dumazet <nicdumz.commits@gmail.com>
date Sun Dec 13 16:35:56 2009 +0900 (2009-12-13)
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];
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 }