hgbook

diff en/figs/undo-manual-merge.dot @ 718:c3863298abc7

Sync Makefile with the source
author Dongsheng Song <songdongsheng@live.cn>
date Thu May 21 17:09:48 2009 +0800 (2009-05-21)
parents c9aad709bd3a
children
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/en/figs/undo-manual-merge.dot	Thu May 21 17:09:48 2009 +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 +}