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