hgbook

diff it/examples/tour.merge.cat2.it @ 833:63ef1efbac57

find changesets by author, revision, files, or words in the commit message
Translate more code, matching repository names in figures.
author gpiancastelli
date Tue Aug 18 17:31:11 2009 +0200 (2009-08-18)
parents 0bf0bf61493e
children 11a6ba60bb9e
line diff
     1.1 --- a/it/examples/tour.merge.cat2.it	Mon Aug 10 21:59:18 2009 +0200
     1.2 +++ b/it/examples/tour.merge.cat2.it	Tue Aug 18 17:31:11 2009 +0200
     1.3 @@ -1,5 +1,5 @@
     1.4  <!-- BEGIN tour.merge.cat2 -->
     1.5 -<screen><prompt>$</prompt> <userinput>cat ../my-hello/hello.c</userinput>
     1.6 +<screen><prompt>$</prompt> <userinput>cat ../mio-hello/hello.c</userinput>
     1.7  /*
     1.8   * Rilasciato nel pubblico dominio da Bryan O'Sullivan. Questo
     1.9   * programma non รจ protetto da brevetti negli Stati Uniti o in