hgbook

view it/figs/bad-merge-4.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
line source
1 digraph bad_merge_4 {
2 ancestor [label="1: progenitore",color="#bbbbbb",fontcolor="#bbbbbb"];
3 left [label="2: mia modifica",color="#bbbbbb",fontcolor="#bbbbbb"];
4 right [label="3: vostra modifica",color="#bbbbbb",fontcolor="#bbbbbb"];
5 bad [label="4: unione sbagliata",color="#bbbbbb",fontcolor="#bbbbbb"];
6 new [label="5: nuova modifica",color="#bbbbbb",fontcolor="#bbbbbb"];
8 bak_left [label="6: ritiro n°1 della\nunione sbagliata",color=grey,fontcolor=grey,shape=box];
9 bak_right [label="7: ritiro n°2 della\nunione sbagliata",color=grey,fontcolor=grey,shape=box];
10 good [label="8: unione\ndei ritiri",shape=box];
12 ancestor -> left [color="#bbbbbb"];
13 ancestor -> right [color="#bbbbbb"];
14 left -> bad [color="#bbbbbb"];
15 right -> bad [color="#bbbbbb"];
16 bad -> new [color="#bbbbbb"];
18 bad -> bak_left [color=grey];
19 left -> bak_left [style=dotted,label="--parent=2",color=grey,fontcolor=grey];
21 bad -> bak_right [color=grey];
22 right -> bak_right [style=dotted,label="--parent=3",color=grey,fontcolor=grey];
24 bak_left -> good;
25 bak_right -> good;
26 }