Mercurial > hgbook

annotate en/undo-manual-merge.dot @ 510:006cd2b41d11

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
corrected translation of a term
author Javier Rojas <jerojasro@devnull.li>
date Mon, 10 Nov 2008 22:20:46 -0500
parents c9aad709bd3a
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 }