annotate it/examples/ch04-resolve.merge.it @ 1113:613690ad6a9c
Merge with dongsheng
author |
Bryan O'Sullivan <bos@serpentine.com> |
date |
Sat Jul 10 16:21:26 2010 +0100 (2010-07-10) |
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 -->
|