hgbook
view it/examples/backout.manual.merge.it @ 798:7f684caba2d0
Minor changes and translation of code snippets for Ch.6.
| author | Giulio@puck |
|---|---|
| date | Thu Aug 13 23:46:21 2009 +0200 (2009-08-13) |
| parents | |
| children | efa16e810ae6 |
line source
1 <!-- BEGIN backout.manual.merge -->
2 <screen><prompt>$</prompt> <userinput>hg merge</userinput>
3 fallimento: modifiche in sospeso non registrate
4 <prompt>$</prompt> <userinput>hg commit -m 'Unisce il changeset che ha compiuto il ritiro con la punta precedente.'</userinput>
5 <prompt>$</prompt> <userinput>cat miofile</userinput>
6 prima modifica
7 </screen>
8 <!-- END backout.manual.merge -->