| rev |
line source |
|
Giulio@832
|
1 digraph bad_merge_5 {
|
|
Giulio@832
|
2 ancestor [label="1: antenato",color="#bbbbbb",fontcolor="#bbbbbb"];
|
|
Giulio@832
|
3 left [label="2: mia modifica",color="#bbbbbb",fontcolor="#bbbbbb"];
|
|
Giulio@832
|
4 right [label="3: vostra modifica",color="#bbbbbb",fontcolor="#bbbbbb"];
|
|
Giulio@832
|
5 bad [label="4: unione sbagliata",color="#bbbbbb",fontcolor="#bbbbbb"];
|
|
Giulio@832
|
6 new [label="5: nuova modifica",color=grey,fontcolor=grey];
|
|
Giulio@832
|
7
|
|
Giulio@832
|
8 bak_left [label="6: ritiro n°1 della\nunione sbagliata",color="#bbbbbb",fontcolor="#bbbbbb",shape=box];
|
|
Giulio@832
|
9 bak_right [label="7: ritiro n°2 della\nunione sbagliata",color="#bbbbbb",fontcolor="#bbbbbb",shape=box];
|
|
Giulio@832
|
10 good [label="8: unione\ndei ritiri",color=grey,fontcolor=grey,shape=box];
|
|
Giulio@832
|
11 last [label="9: unione con la\nnuova modifica",shape=box];
|
|
Giulio@832
|
12
|
|
Giulio@832
|
13 ancestor -> left [color="#bbbbbb"];
|
|
Giulio@832
|
14 ancestor -> right [color="#bbbbbb"];
|
|
Giulio@832
|
15 left -> bad [color="#bbbbbb"];
|
|
Giulio@832
|
16 right -> bad [color="#bbbbbb"];
|
|
Giulio@832
|
17 bad -> new [color="#bbbbbb"];
|
|
Giulio@832
|
18
|
|
Giulio@832
|
19 bad -> bak_left [color="#bbbbbb"];
|
|
Giulio@832
|
20 left -> bak_left [style=dotted,label="--parent=2",color="#bbbbbb",fontcolor="#bbbbbb"];
|
|
Giulio@832
|
21
|
|
Giulio@832
|
22 bad -> bak_right [color="#bbbbbb"];
|
|
Giulio@832
|
23 right -> bak_right [style=dotted,label="--parent=3",color="#bbbbbb",fontcolor="#bbbbbb"];
|
|
Giulio@832
|
24
|
|
Giulio@832
|
25 bak_left -> good [color=grey];
|
|
Giulio@832
|
26 bak_right -> good [color=grey];
|
|
Giulio@832
|
27
|
|
Giulio@832
|
28 good -> last;
|
|
Giulio@832
|
29 new -> last;
|
|
Giulio@832
|
30 }
|
