hgbook
diff en/figs/undo-manual-merge.dot @ 1114:527b86d55d4a
inotify: update installation information
inotify is shipped in Mercurial since 1.0, which greatly simplifies the installation process
inotify is shipped in Mercurial since 1.0, which greatly simplifies the installation process
author | Nicolas Dumazet <nicdumz.commits@gmail.com> |
---|---|
date | Sun Dec 13 16:35:56 2009 +0900 (2009-12-13) |
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 Sun Dec 13 16:35:56 2009 +0900 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 +}