annotate it/examples/ch04-resolve.merge.it @ 790:3d5e63d5d180
Minor changes and translation of code snippets for Ch.5.
| author |
Giulio@puck |
| date |
Tue Aug 11 21:53:03 2009 +0200 (2009-08-11) |
| parents |
|
| children |
|
| rev |
line source |
|
Giulio@790
|
1 <!-- BEGIN ch04/resolve.merge -->
|
|
Giulio@790
|
2 <screen><prompt>$</prompt> <userinput>hg merge</userinput>
|
|
Giulio@790
|
3 unisco miofile.txt
|
|
Giulio@790
|
4 merge: attenzione: conflitti durante l'unione
|
|
Giulio@790
|
5 unione di miofile.txt fallita!
|
|
Giulio@790
|
6 0 file aggiornati, 0 file uniti, 0 file rimossi, 1 file irrisolti
|
|
Giulio@790
|
7 usate 'hg resolve' per riprovare a unire i file irrisolti o 'hg up --clean' per abbandonare
|
|
Giulio@790
|
8 </screen>
|
|
Giulio@790
|
9 <!-- END ch04/resolve.merge -->
|
