hgbook
diff en/undo-manual-merge.dot @ 224:34943a3d50d6
Start writing up extensions. Begin with inotify.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Tue May 15 16:24:20 2007 -0700 (2007-05-15) |
parents | |
children |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/en/undo-manual-merge.dot Tue May 15 16:24:20 2007 -0700 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 +}