hgbook

annotate fr/figs/bad-merge-1.dot @ 964:6b680d569bb4

find changesets by author, revision, files, or words in the commit message
deleting a bunch of files not longer necessary to build the documentation.
Adding missing newly files needed to build the documentation
author Romain PELISSE <belaran@gmail.com>
date Sun Aug 16 04:58:01 2009 +0200 (2009-08-16)
parents en/figs/bad-merge-1.dot@7226e5e750a6
children
rev   line source
bos@680 1 digraph bad_merge_1 {
bos@680 2 ancestor [label="1: ancestor"];
bos@680 3 left [label="2: my change"];
bos@680 4 right [label="3: your change"];
bos@680 5 bad [label="4: bad merge"];
bos@680 6 new [label="5: new change"];
bos@680 7
bos@680 8 ancestor -> left;
bos@680 9 ancestor -> right;
bos@680 10 left -> bad;
bos@680 11 right -> bad;
bos@680 12 bad -> new;
bos@680 13 }