hgbook

view en/figs/bad-merge-1.dot @ 963:1dd00abb3fa9

find changesets by author, revision, files, or words in the commit message
merge with bryan - it's been a while but everything seems ok
author Romain PELISSE <belaran@gmail.com>
date Sun Aug 16 03:41:39 2009 +0200 (2009-08-16)
parents
children
line source
1 digraph bad_merge_1 {
2 ancestor [label="1: ancestor"];
3 left [label="2: my change"];
4 right [label="3: your change"];
5 bad [label="4: bad merge"];
6 new [label="5: new change"];
7
8 ancestor -> left;
9 ancestor -> right;
10 left -> bad;
11 right -> bad;
12 bad -> new;
13 }