hgbook

diff it/examples/tour.merge.cat2.it @ 1052:c8b5a06543c0

find changesets by author, revision, files, or words in the commit message
cvs section translated
author zhaopingsun
date Tue Nov 10 16:25:43 2009 -0500 (2009-11-10)
parents 63ef1efbac57
children 719b03ea27c8
line diff
     1.1 --- a/it/examples/tour.merge.cat2.it	Tue Aug 18 17:31:11 2009 +0200
     1.2 +++ b/it/examples/tour.merge.cat2.it	Tue Nov 10 16:25:43 2009 -0500
     1.3 @@ -1,7 +1,7 @@
     1.4  <!-- BEGIN tour.merge.cat2 -->
     1.5  <screen><prompt>$</prompt> <userinput>cat ../mio-hello/hello.c</userinput>
     1.6  /*
     1.7 - * Rilasciato nel pubblico dominio da Bryan O'Sullivan. Questo
     1.8 + * Rilasciato al pubblico dominio da Bryan O'Sullivan. Questo
     1.9   * programma non รจ protetto da brevetti negli Stati Uniti o in
    1.10   * altri paesi.
    1.11   */