hgbook

diff it/figs/bad-merge-1.dot @ 1077:02a588f8933a

2.4.1 first para zh translated
author Zhaoping Sun <zhaopingsun@gmail.com>
date Wed Nov 18 21:58:15 2009 -0500 (2009-11-18)
parents ea5ae4dd787b
children 719b03ea27c8
line diff
     1.1 --- a/it/figs/bad-merge-1.dot	Tue Aug 18 17:19:30 2009 +0200
     1.2 +++ b/it/figs/bad-merge-1.dot	Wed Nov 18 21:58:15 2009 -0500
     1.3 @@ -1,5 +1,5 @@
     1.4  digraph bad_merge_1 {
     1.5 -	ancestor [label="1: antenato"];
     1.6 +	ancestor [label="1: progenitore"];
     1.7  	left [label="2: mia modifica"];
     1.8  	right [label="3: vostra modifica"];
     1.9  	bad [label="4: unione sbagliata"];