hgbook

view en/figs/bad-merge-1.dot @ 705:d5688822c51d

find changesets by author, revision, files, or words in the commit message
Preface, now with actual text
author Bryan O'Sullivan <bos@serpentine.com>
date Thu May 07 22:32:55 2009 -0700 (2009-05-07)
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 }