hgbook

view fr/figs/bad-merge-1.dot @ 1002:55d1bf9b47a4

find changesets by author, revision, files, or words in the commit message
French translation : merge with Romain Perlisse's repository
author Frédéric Bouquet <youshe.jaalon@gmail.com>
date Mon Sep 14 01:31:50 2009 +0200 (2009-09-14)
parents 7226e5e750a6
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 }