Mercurial > hgbook
diff en/figs/undo-manual-merge.dot @ 674:bebd5ff7fe7f
And there was much tidying, and the result was good.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Tue, 10 Mar 2009 21:58:03 -0700 |
parents | en/undo-manual-merge.dot@c9aad709bd3a |
children |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/en/figs/undo-manual-merge.dot Tue Mar 10 21:58:03 2009 -0700 @@ -0,0 +1,8 @@ +digraph undo_manual { + "first change" -> "second change"; + "second change" -> "third change"; + backout [label="back out\nsecond change", shape=box]; + "second change" -> backout; + "third change" -> "manual\nmerge"; + backout -> "manual\nmerge"; +}