hgbook

view it/examples/ch04-resolve.merge.it @ 1050:add323f1ff4e

find changesets by author, revision, files, or words in the commit message
1.6.2 finished,and first 2 paras of 1.6.3 refined
author Zhaoping Sun <zhaopingsun@gmail.com>
date Tue Nov 10 19:05:24 2009 -0500 (2009-11-10)
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 -->