hgbook

view it/figs/bad-merge-1.dot @ 1031:d6d7136b0f74

find changesets by author, revision, files, or words in the commit message
Merge with gpiancastelli
author Bryan O'Sullivan <bos@serpentine.com>
date Sat Jul 10 06:24:30 2010 +0100 (2010-07-10)
parents ea5ae4dd787b
children 719b03ea27c8
line source
1 digraph bad_merge_1 {
2 ancestor [label="1: progenitore"];
3 left [label="2: mia modifica"];
4 right [label="3: vostra modifica"];
5 bad [label="4: unione sbagliata"];
6 new [label="5: nuova modifica"];
7
8 ancestor -> left;
9 ancestor -> right;
10 left -> bad;
11 right -> bad;
12 bad -> new;
13 }