hgbook
diff ja/undo-manual-merge.dot @ 1030:2ac31ea48a3d
merge with trunk
author | Romain PELISSE <belaran@gmail.com> |
---|---|
date | Thu Apr 22 12:39:32 2010 +0200 (2010-04-22) |
parents | |
children |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/ja/undo-manual-merge.dot Thu Apr 22 12:39:32 2010 +0200 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 +}