hgbook

annotate en/figs/undo-manual-merge.dot @ 670:e9ef075327c1

Merge with http://bitbucket.org/dongsheng/hgbook/
author Bryan O'Sullivan <bos@serpentine.com>
date Mon Apr 06 23:15:52 2009 -0700 (2009-04-06)
parents c9aad709bd3a
children
rev   line source
bos@124 1 digraph undo_manual {
bos@124 2 "first change" -> "second change";
bos@124 3 "second change" -> "third change";
bos@124 4 backout [label="back out\nsecond change", shape=box];
bos@124 5 "second change" -> backout;
bos@124 6 "third change" -> "manual\nmerge";
bos@124 7 backout -> "manual\nmerge";
bos@124 8 }