Mercurial > hgbook

annotate es/undo-manual-merge.dot @ 435:7e52f0cc4516

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
changed es/hgext.tex changed es/hook.tex changed es/kdiff3.png changed es/license.tex changed es/mq-collab.tex changed es/mq-ref.tex changed es/mq.tex changed es/note.png changed es/tour-merge.tex changed es/undo-manual-merge.dot changed es/undo-non-tip.dot files needed to compile the pdf version of the book.
author jerojasro@localhost
date Sat, 18 Oct 2008 15:44:41 -0500
parents en/undo-manual-merge.dot@c9aad709bd3a
children 0aa96b0ffb65
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 }