hgbook

annotate it/examples/tour.merge.parents.it @ 976:713f0f69029a

find changesets by author, revision, files, or words in the commit message
merge with Italian, and very (few) work on ch03
author Romain PELISSE <belaran@gmail.com>
date Fri Sep 04 16:33:35 2009 +0200 (2009-09-04)
parents
children 719b03ea27c8
rev   line source
belaran@976 1 <!-- BEGIN tour.merge.parents -->
belaran@976 2 <screen><prompt>$</prompt> <userinput>hg parents</userinput>
belaran@976 3 changeset: 5:1c343117a2e3
belaran@976 4 utente: Bryan O'Sullivan &lt;bos@serpentine.com&gt;
belaran@976 5 data: Fri Jun 05 15:52:03 2009 +0000
belaran@976 6 sommario: Un nuovo saluto per un nuovo giorno.
belaran@976 7
belaran@976 8 changeset: 6:764347e47e75
belaran@976 9 etichetta: tip
belaran@976 10 genitore: 4:2278160e78d4
belaran@976 11 utente: Bryan O'Sullivan &lt;bos@serpentine.com&gt;
belaran@976 12 data: Fri Jun 05 15:51:52 2009 +0000
belaran@976 13 sommario: Inserisce una riga con un messaggio aggiuntivo.
belaran@976 14
belaran@976 15 <prompt>$</prompt> <userinput>cat hello.c</userinput>
belaran@976 16 /*
belaran@976 17 * Rilasciato al pubblico dominio da Bryan O'Sullivan. Questo
belaran@976 18 * programma non รจ protetto da brevetti negli Stati Uniti o in
belaran@976 19 * altri paesi.
belaran@976 20 */
belaran@976 21
belaran@976 22 #include &lt;stdio.h&gt;
belaran@976 23
belaran@976 24 int main(int argc, char **argv)
belaran@976 25 {
belaran@976 26 printf("ancora una volta, ciao.\n");
belaran@976 27 printf("ciao, mondo!\");
belaran@976 28 printf("ancora ciao!\n");
belaran@976 29 return 0;
belaran@976 30 }
belaran@976 31 </screen>
belaran@976 32 <!-- END tour.merge.parents -->