Mercurial > hgbook
annotate en/undo-manual.dot @ 401:e281bd9a8e47
Fix sample output for test 'tour-merge-conflict'.
Fix test itself as well (now requires 'hg resolve').
author | Guido Ostkamp <hg@ostkamp.fastmail.fm> |
---|---|
date | Wed, 20 Aug 2008 22:00:46 +0200 |
parents | c9aad709bd3a |
children |
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 } |