hgbook
diff fr/figs/bad-merge-1.dot @ 964:6b680d569bb4
deleting a bunch of files not longer necessary to build the documentation.
Adding missing newly files needed 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 |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/fr/figs/bad-merge-1.dot Sun Aug 16 04:58:01 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 +}