hgbook

diff fr/undo-manual-merge.dot @ 946:1f2044943861

find changesets by author, revision, files, or words in the commit message
Oops, overwrite some of my translation by adding Hugues works... Corrected.
author Romain PELISSE <belaran@gmail.com>
date Mon Feb 16 18:51:52 2009 +0100 (2009-02-16)
parents c9aad709bd3a
children
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/fr/undo-manual-merge.dot	Mon Feb 16 18:51:52 2009 +0100
     1.3 @@ -0,0 +1,8 @@
     1.4 +digraph undo_manual {
     1.5 +	"first change" -> "second change";
     1.6 +	"second change" -> "third change";
     1.7 +	backout [label="back out\nsecond change", shape=box];
     1.8 +	"second change" -> backout;
     1.9 +	"third change" -> "manual\nmerge";
    1.10 +	backout -> "manual\nmerge";
    1.11 +}