hgbook
annotate it/examples/tour.merge.pull.it @ 999:a6b81cd31cfd
adding complete.xml - which generated but Bryan did add it also - as I have absolutly no personnality I do as he does
| author | Romain PELISSE <belaran@gmail.com> |
|---|---|
| date | Sat Sep 12 20:53:36 2009 +0200 (2009-09-12) |
| parents | 713f0f69029a 63ef1efbac57 |
| children |
| rev | line source |
|---|---|
| Giulio@785 | 1 <!-- BEGIN tour.merge.pull --> |
| gpiancastelli@833 | 2 <screen><prompt>$</prompt> <userinput>hg pull ../mio-hello</userinput> |
| gpiancastelli@833 | 3 estraggo da ../mio-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 --> |