hgbook

diff it/examples/tour.merge.tip.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.tip.it	Mon Aug 10 21:59:18 2009 +0200
     1.2 +++ b/it/examples/tour.merge.tip.it	Wed Aug 19 19:39:24 2009 +0200
     1.3 @@ -1,12 +1,12 @@
     1.4  <!-- BEGIN tour.merge.tip -->
     1.5  <screen><prompt>$</prompt> <userinput>hg tip</userinput>
     1.6  changeset:   7:e300c3dcceca
     1.7 -tag:         tip
     1.8 -parent:      5:1c343117a2e3
     1.9 -parent:      6:764347e47e75
    1.10 -user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
    1.11 -date:        Fri Jun 05 15:52:07 2009 +0000
    1.12 -summary:     Unisce i cambiamenti.
    1.13 +etichetta:   tip
    1.14 +genitore:    5:1c343117a2e3
    1.15 +genitore:    6:764347e47e75
    1.16 +utente:      Bryan O'Sullivan &lt;bos@serpentine.com&gt;
    1.17 +data:        Fri Jun 05 15:52:07 2009 +0000
    1.18 +sommario:    Unisce i cambiamenti.
    1.19  
    1.20  </screen>
    1.21  <!-- END tour.merge.tip -->