Mercurial > hgbook
annotate en/undo-manual-merge.dot @ 529:3afc654d70e5
translated some paragraphs. yawn sleepy
author | jerojasro@localhost |
---|---|
date | Sat, 29 Nov 2008 23:48:11 -0500 |
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 "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 } |