hgbook

diff it/examples/tour.merge.cat2.it @ 787:d511cb890aa9

find changesets by author, revision, files, or words in the commit message
Better translation of Mercurial abort message.
author Giulio@puck
date Tue Aug 11 18:08:00 2009 +0200 (2009-08-11)
parents
children 63ef1efbac57
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/it/examples/tour.merge.cat2.it	Tue Aug 11 18:08:00 2009 +0200
     1.3 @@ -0,0 +1,18 @@
     1.4 +<!-- BEGIN tour.merge.cat2 -->
     1.5 +<screen><prompt>$</prompt> <userinput>cat ../my-hello/hello.c</userinput>
     1.6 +/*
     1.7 + * Rilasciato nel pubblico dominio da Bryan O'Sullivan. Questo
     1.8 + * programma non รจ protetto da brevetti negli Stati Uniti o in
     1.9 + * altri paesi.
    1.10 + */
    1.11 +
    1.12 +#include &lt;stdio.h&gt;
    1.13 +
    1.14 +int main(int argc, char **argv)
    1.15 +{
    1.16 +	printf("ciao, mondo!\");
    1.17 +	printf("ancora ciao!\n");
    1.18 +	return 0;
    1.19 +}
    1.20 +</screen>
    1.21 +<!-- END tour.merge.cat2 -->