hgbook

diff it/examples/tour.merge.tip.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
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/it/examples/tour.merge.tip.it	Fri Sep 04 16:33:35 2009 +0200
     1.3 @@ -0,0 +1,12 @@
     1.4 +<!-- BEGIN tour.merge.tip -->
     1.5 +<screen><prompt>$</prompt> <userinput>hg tip</userinput>
     1.6 +changeset:   7:e300c3dcceca
     1.7 +etichetta:   tip
     1.8 +genitore:    5:1c343117a2e3
     1.9 +genitore:    6:764347e47e75
    1.10 +utente:      Bryan O'Sullivan &lt;bos@serpentine.com&gt;
    1.11 +data:        Fri Jun 05 15:52:07 2009 +0000
    1.12 +sommario:    Unisce i cambiamenti.
    1.13 +
    1.14 +</screen>
    1.15 +<!-- END tour.merge.tip -->