hgbook

diff en/figs/bad-merge-1.dot @ 1010:cd06c45e1631

find changesets by author, revision, files, or words in the commit message
French translation : ch06-collab.xml - about 50% translated
author Frédéric Bouquet <youshe.jaalon@gmail.com>
date Mon Sep 21 00:02:10 2009 +0200 (2009-09-21)
parents
children
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/en/figs/bad-merge-1.dot	Mon Sep 21 00:02:10 2009 +0200
     1.3 @@ -0,0 +1,13 @@
     1.4 +digraph bad_merge_1 {
     1.5 +	ancestor [label="1: ancestor"];
     1.6 +	left [label="2: my change"];
     1.7 +	right [label="3: your change"];
     1.8 +	bad [label="4: bad merge"];
     1.9 +	new [label="5: new change"];
    1.10 +
    1.11 +	ancestor -> left;
    1.12 +	ancestor -> right;
    1.13 +	left -> bad;
    1.14 +	right -> bad;
    1.15 +	bad -> new;
    1.16 +}