hgbook

diff en/undo-manual-merge.dot @ 132:e1e2f3e0256a

find changesets by author, revision, files, or words in the commit message
Start command reference, with the diff command.
author Bryan O'Sullivan <bos@serpentine.com>
date Thu Dec 28 16:45:56 2006 -0800 (2006-12-28)
parents
children
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/en/undo-manual-merge.dot	Thu Dec 28 16:45:56 2006 -0800
     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 +}