hgbook

view it/examples/ch04-resolve.merge.it @ 1084:136342c64c09

find changesets by author, revision, files, or words in the commit message
2.4.2 zh translated finished
author Zhaoping Sun <zhaopingsun@gmail.com>
date Fri Nov 20 07:44:53 2009 -0500 (2009-11-20)
parents
children
line source
1 <!-- BEGIN ch04/resolve.merge -->
2 <screen><prompt>$</prompt> <userinput>hg merge</userinput>
3 unisco miofile.txt
4 merge: attenzione: conflitti durante l'unione
5 unione di miofile.txt fallita!
6 0 file aggiornati, 0 file uniti, 0 file rimossi, 1 file irrisolti
7 usate 'hg resolve' per riprovare a unire i file irrisolti o 'hg up --clean' per abbandonare
8 </screen>
9 <!-- END ch04/resolve.merge -->