hgbook
view it/examples/tour.merge.pull.it @ 990:b4ff7b04efdc
French translation : corrected some mistakes in ch05-daily
| author | Frédéric Bouquet <youshe.jaalon@gmail.com> |
|---|---|
| date | Thu Sep 10 14:45:17 2009 +0200 (2009-09-10) |
| parents | 713f0f69029a 63ef1efbac57 |
| children |
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 -->