annotate it/figs/bad-merge-2.dot @ 976:713f0f69029a
merge with Italian, and very (few) work on ch03
author |
Romain PELISSE <belaran@gmail.com> |
date |
Fri Sep 04 16:33:35 2009 +0200 (2009-09-04) |
parents |
|
children |
719b03ea27c8 |
rev |
line source |
belaran@976
|
1 digraph bad_merge_2 {
|
belaran@976
|
2 ancestor [label="1: progenitore",color=grey,fontcolor=grey];
|
belaran@976
|
3 left [label="2: mia modifica",color=grey,fontcolor=grey];
|
belaran@976
|
4 right [label="3: vostra modifica",color=grey,fontcolor=grey];
|
belaran@976
|
5 bad [label="4: unione sbagliata",color=grey,fontcolor=grey];
|
belaran@976
|
6 new [label="5: nuova modifica",color=grey,fontcolor=grey];
|
belaran@976
|
7
|
belaran@976
|
8 bak_left [label="6: ritiro n°1 della\nunione sbagliata",shape=box];
|
belaran@976
|
9
|
belaran@976
|
10 ancestor -> left [color=grey];
|
belaran@976
|
11 ancestor -> right [color=grey];
|
belaran@976
|
12 left -> bad [color=grey];
|
belaran@976
|
13 right -> bad [color=grey];
|
belaran@976
|
14 bad -> new [color=grey];
|
belaran@976
|
15
|
belaran@976
|
16 bad -> bak_left;
|
belaran@976
|
17 left -> bak_left [style=dotted,label="--parent=2"];
|
belaran@976
|
18 }
|