hgbook

annotate en/figs/bad-merge-1.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
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 }