hgbook
view it/examples/tour.merge.pull.it @ 792:5b79834be9a6
Minor changes and translation of code snippets for Ch.8.
| author | Giulio@puck |
|---|---|
| date | Wed Aug 12 16:44:35 2009 +0200 (2009-08-12) |
| parents | |
| children | 63ef1efbac57 |
line source
1 <!-- BEGIN tour.merge.pull -->
2 <screen><prompt>$</prompt> <userinput>hg pull ../my-hello</userinput>
3 estraggo da ../my-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 -->