hgbook
view it/examples/backout.manual.merge.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 5bbebcdfb533 |
| children |
line source
1 <!-- BEGIN backout.manual.merge -->
2 <screen><prompt>$</prompt> <userinput>hg merge</userinput>
3 unisco miofile
4 0 file aggiornati, 1 file uniti, 0 file rimossi, 0 file irrisolti
5 (unione tra rami, ricordatevi di eseguire il commit)
6 <prompt>$</prompt> <userinput>hg commit -m "Unisce il changeset che ha compiuto il ritiro con la punta precedente."</userinput>
7 <prompt>$</prompt> <userinput>cat miofile</userinput>
8 prima modifica
9 terza modifica
10 </screen>
11 <!-- END backout.manual.merge -->