hgbook

diff ja/undo-manual-merge.dot @ 1050:add323f1ff4e

find changesets by author, revision, files, or words in the commit message
1.6.2 finished,and first 2 paras of 1.6.3 refined
author Zhaoping Sun <zhaopingsun@gmail.com>
date Tue Nov 10 19:05:24 2009 -0500 (2009-11-10)
parents
children
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/ja/undo-manual-merge.dot	Tue Nov 10 19:05:24 2009 -0500
     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 +}