annotate en/images/undo-manual-merge.dot @ 737:9038da8b2d22

Merge with http://hg.serpentine.com/mercurial/book
author Dongsheng Song <dongsheng.song@gmail.com>
date Mon, 16 Mar 2009 17:23:05 +0800
parents 0e3d8f66bbb7
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
124
c9aad709bd3a Document the backout command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
1 digraph undo_manual {
c9aad709bd3a Document the backout command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
2 "first change" -> "second change";
c9aad709bd3a Document the backout command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
3 "second change" -> "third change";
c9aad709bd3a Document the backout command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
4 backout [label="back out\nsecond change", shape=box];
c9aad709bd3a Document the backout command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
5 "second change" -> backout;
c9aad709bd3a Document the backout command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
6 "third change" -> "manual\nmerge";
c9aad709bd3a Document the backout command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
7 backout -> "manual\nmerge";
c9aad709bd3a Document the backout command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
8 }