hgbook

diff it/examples/branch-named.merge.it @ 804:16c50eea5366

find changesets by author, revision, files, or words in the commit message
Minor changes and translation of code snippets for Ch.14.
author Giulio@puck
date Sat Aug 15 03:01:38 2009 +0200 (2009-08-15)
parents
children 7252e7b7f07d
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/it/examples/branch-named.merge.it	Sat Aug 15 03:01:38 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 +branch:      bar
    1.14 +tag:         tip
    1.15 +parent:      2:4dce38140953
    1.16 +parent:      3:859c842ea668
    1.17 +user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
    1.18 +date:        Fri Jun 05 15:49:06 2009 +0000
    1.19 +summary:     Unione.
    1.20 +
    1.21 +</screen>
    1.22 +<!-- END branch-named.merge -->