hgbook

diff it/examples/branch-named.merge.it @ 840:7252e7b7f07d

find changesets by author, revision, files, or words in the commit message
Final editing for chapters 8-11.
author gpiancastelli
date Fri Aug 21 22:29:44 2009 +0200 (2009-08-21)
parents 5b79834be9a6
children 5bbebcdfb533
line diff
     1.1 --- a/it/examples/branch-named.merge.it	Wed Aug 12 16:44:35 2009 +0200
     1.2 +++ b/it/examples/branch-named.merge.it	Fri Aug 21 22:29:44 2009 +0200
     1.3 @@ -7,13 +7,13 @@
     1.4  <prompt>$</prompt> <userinput>hg commit -m 'Unione.'</userinput>
     1.5  <prompt>$</prompt> <userinput>hg tip</userinput>
     1.6  changeset:   4:f50f493d0dc0
     1.7 -branch:      bar
     1.8 -tag:         tip
     1.9 -parent:      2:4dce38140953
    1.10 -parent:      3:859c842ea668
    1.11 -user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
    1.12 -date:        Fri Jun 05 15:49:06 2009 +0000
    1.13 -summary:     Unione.
    1.14 +ramo:        bar
    1.15 +etichetta:   tip
    1.16 +genitore:    2:4dce38140953
    1.17 +genitore:    3:859c842ea668
    1.18 +utente:      Bryan O'Sullivan &lt;bos@serpentine.com&gt;
    1.19 +data:        Fri Jun 05 15:49:06 2009 +0000
    1.20 +sommario:    Unione.
    1.21  
    1.22  </screen>
    1.23  <!-- END branch-named.merge -->