hgbook
diff it/figs/bad-merge-3.dot @ 877:3d6f290fe822
Update README.BUILD
author | Dongsheng Song <dongsheng.song@gmail.com> |
---|---|
date | Wed Oct 21 11:57:11 2009 +0800 (2009-10-21) |
parents | ea5ae4dd787b |
children | 719b03ea27c8 |
line diff
1.1 --- a/it/figs/bad-merge-3.dot Tue Aug 18 17:19:30 2009 +0200 1.2 +++ b/it/figs/bad-merge-3.dot Wed Oct 21 11:57:11 2009 +0800 1.3 @@ -1,5 +1,5 @@ 1.4 digraph bad_merge_3 { 1.5 - ancestor [label="1: antenato",color="#bbbbbb",fontcolor="#bbbbbb"]; 1.6 + ancestor [label="1: progenitore",color="#bbbbbb",fontcolor="#bbbbbb"]; 1.7 left [label="2: mia modifica",color="#bbbbbb",fontcolor="#bbbbbb"]; 1.8 right [label="3: vostra modifica",color="#bbbbbb",fontcolor="#bbbbbb"]; 1.9 bad [label="4: unione sbagliata",color="#bbbbbb",fontcolor="#bbbbbb"];