annotate en/undo-manual-merge.dot @ 948:afdc168fa06c
Merge from Hugues and my work
| author |
Romain PELISSE <belaran@gmail.com> |
| date |
Mon Feb 16 23:31:14 2009 +0100 (2009-02-16) |
| parents |
|
| children |
|
| rev |
line source |
|
bos@124
|
1 digraph undo_manual {
|
|
bos@124
|
2 "first change" -> "second change";
|
|
bos@124
|
3 "second change" -> "third change";
|
|
bos@124
|
4 backout [label="back out\nsecond change", shape=box];
|
|
bos@124
|
5 "second change" -> backout;
|
|
bos@124
|
6 "third change" -> "manual\nmerge";
|
|
bos@124
|
7 backout -> "manual\nmerge";
|
|
bos@124
|
8 }
|
