hgbook

view it/figs/bad-merge-1.dot @ 1024:ea04ebd452b5

find changesets by author, revision, files, or words in the commit message
French : second part of ch06
author André Sintzoff <andre.sintzoff@gmail.com>
date Thu Dec 03 22:45:38 2009 +0100 (2009-12-03)
parents 713f0f69029a 793e15b562ef
children
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 }