hgbook
annotate it/examples/tour.merge.pull.it @ 791:bf84d6b2281c
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 |
| rev | line source |
|---|---|
| Giulio@785 | 1 <!-- BEGIN tour.merge.pull --> |
| Giulio@785 | 2 <screen><prompt>$</prompt> <userinput>hg pull ../my-hello</userinput> |
| Giulio@785 | 3 estraggo da ../my-hello |
| Giulio@785 | 4 cerco i cambiamenti |
| Giulio@785 | 5 aggiungo i changeset |
| Giulio@785 | 6 aggiungo i manifest |
| Giulio@785 | 7 aggiungo i cambiamenti ai file |
| Giulio@785 | 8 aggiunti 1 changeset con 1 cambiamenti a 1 file (+1 teste) |
| Giulio@785 | 9 (eseguite 'hg heads' per vedere le teste, 'hg merge' per unire) |
| Giulio@785 | 10 </screen> |
| Giulio@785 | 11 <!-- END tour.merge.pull --> |