hgbook

diff it/examples/tour.merge.cat1.it @ 836:11a6ba60bb9e

find changesets by author, revision, files, or words in the commit message
Final editing for chapters 0-3.
author gpiancastelli
date Wed Aug 19 19:39:24 2009 +0200 (2009-08-19)
parents 0bf0bf61493e
children 719b03ea27c8
line diff
     1.1 --- a/it/examples/tour.merge.cat1.it	Mon Aug 10 21:59:18 2009 +0200
     1.2 +++ b/it/examples/tour.merge.cat1.it	Wed Aug 19 19:39:24 2009 +0200
     1.3 @@ -1,7 +1,7 @@
     1.4  <!-- BEGIN tour.merge.cat1 -->
     1.5  <screen><prompt>$</prompt> <userinput>cat 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   */