hgbook
view it/examples/tour.merge.pull.it @ 917:93154fbaae9b
Merge with http://bitbucket.org/dukebody/hgbook-alqua/
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Tue Oct 27 21:31:06 2009 -0700 (2009-10-27) |
parents | 0bf0bf61493e |
children | 719b03ea27c8 |
line source
1 <!-- BEGIN tour.merge.pull -->
2 <screen><prompt>$</prompt> <userinput>hg pull ../mio-hello</userinput>
3 estraggo da ../mio-hello
4 cerco i cambiamenti
5 aggiungo i changeset
6 aggiungo i manifest
7 aggiungo i cambiamenti ai file
8 aggiunti 1 changeset con 1 cambiamenti a 1 file (+1 teste)
9 (eseguite 'hg heads' per vedere le teste, 'hg merge' per unire)
10 </screen>
11 <!-- END tour.merge.pull -->