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