hgbook

diff it/examples/tour.merge.pull.it @ 791:bf84d6b2281c

find changesets by author, revision, files, or words in the commit message
Minor changes and translation of code snippets for Ch.7.
author Giulio@puck
date Tue Aug 11 23:01:30 2009 +0200 (2009-08-11)
parents
children 63ef1efbac57
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/it/examples/tour.merge.pull.it	Tue Aug 11 23:01:30 2009 +0200
     1.3 @@ -0,0 +1,11 @@
     1.4 +<!-- BEGIN tour.merge.pull -->
     1.5 +<screen><prompt>$</prompt> <userinput>hg pull ../my-hello</userinput>
     1.6 +estraggo da ../my-hello
     1.7 +cerco i cambiamenti
     1.8 +aggiungo i changeset
     1.9 +aggiungo i manifest
    1.10 +aggiungo i cambiamenti ai file
    1.11 +aggiunti 1 changeset con 1 cambiamenti a 1 file (+1 teste)
    1.12 +(eseguite 'hg heads' per vedere le teste, 'hg merge' per unire)
    1.13 +</screen>
    1.14 +<!-- END tour.merge.pull -->