hgbook

diff it/examples/tour-merge-conflict.commit.it @ 1078:708f570346a9

find changesets by author, revision, files, or words in the commit message
2.4.1 some para zh translated
author Zhaoping Sun <zhaopingsun@gmail.com>
date Wed Nov 18 22:22:34 2009 -0500 (2009-11-18)
parents 0bf0bf61493e
children 719b03ea27c8
line diff
     1.1 --- a/it/examples/tour-merge-conflict.commit.it	Mon Aug 10 21:59:18 2009 +0200
     1.2 +++ b/it/examples/tour-merge-conflict.commit.it	Wed Nov 18 22:22:34 2009 -0500
     1.3 @@ -8,12 +8,12 @@
     1.4  <prompt>$</prompt> <userinput>hg commit -m 'Mandatemi i vostri soldi'</userinput>
     1.5  <prompt>$</prompt> <userinput>hg tip</userinput>
     1.6  changeset:   3:df19ae0ef4d4
     1.7 -tag:         tip
     1.8 -parent:      1:ae14113af250
     1.9 -parent:      2:11ab3b2b6d1b
    1.10 -user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
    1.11 -date:        Fri Jun 05 15:52:13 2009 +0000
    1.12 -summary:     Mandatemi i vostri soldi
    1.13 +etichetta:   tip
    1.14 +genitore:    1:ae14113af250
    1.15 +genitore:    2:11ab3b2b6d1b
    1.16 +utente:      Bryan O'Sullivan &lt;bos@serpentine.com&gt;
    1.17 +data:        Fri Jun 05 15:52:13 2009 +0000
    1.18 +sommario:    Mandatemi i vostri soldi
    1.19  
    1.20  </screen>
    1.21  <!-- END tour-merge-conflict.commit -->