hgbook

diff it/examples/branch-named.merge.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/branch-named.merge.it	Fri Sep 04 16:33:35 2009 +0200
     1.3 @@ -0,0 +1,19 @@
     1.4 +<!-- BEGIN branch-named.merge -->
     1.5 +<screen><prompt>$</prompt> <userinput>hg branch</userinput>
     1.6 +bar
     1.7 +<prompt>$</prompt> <userinput>hg merge foo</userinput>
     1.8 +1 file aggiornati, 0 file uniti, 0 file rimossi, 0 file irrisolti
     1.9 +(unione tra rami, ricordatevi di effettuare il commit)
    1.10 +<prompt>$</prompt> <userinput>hg commit -m "Unione."</userinput>
    1.11 +<prompt>$</prompt> <userinput>hg tip</userinput>
    1.12 +changeset:   4:f50f493d0dc0
    1.13 +ramo:        bar
    1.14 +etichetta:   tip
    1.15 +genitore:    2:4dce38140953
    1.16 +genitore:    3:859c842ea668
    1.17 +utente:      Bryan O'Sullivan &lt;bos@serpentine.com&gt;
    1.18 +data:        Fri Jun 05 15:49:06 2009 +0000
    1.19 +sommario:    Unione.
    1.20 +
    1.21 +</screen>
    1.22 +<!-- END branch-named.merge -->