hgbook
annotate it/examples/tour.merge.pull.it @ 976:713f0f69029a
merge with Italian, and very (few) work on ch03
| author | Romain PELISSE <belaran@gmail.com> |
|---|---|
| date | Fri Sep 04 16:33:35 2009 +0200 (2009-09-04) |
| parents | |
| children | 719b03ea27c8 |
| rev | line source |
|---|---|
| belaran@976 | 1 <!-- BEGIN tour.merge.pull --> |
| belaran@976 | 2 <screen><prompt>$</prompt> <userinput>hg pull ../mio-hello</userinput> |
| belaran@976 | 3 estraggo da ../mio-hello |
| belaran@976 | 4 cerco i cambiamenti |
| belaran@976 | 5 aggiungo i changeset |
| belaran@976 | 6 aggiungo i manifest |
| belaran@976 | 7 aggiungo i cambiamenti ai file |
| belaran@976 | 8 aggiunti 1 changeset con 1 cambiamenti a 1 file (+1 teste) |
| belaran@976 | 9 (eseguite 'hg heads' per vedere le teste, 'hg merge' per unire) |
| belaran@976 | 10 </screen> |
| belaran@976 | 11 <!-- END tour.merge.pull --> |