hgbook

diff it/examples/ch04-resolve.merge.it @ 1085:b71b3f734904

find changesets by author, revision, files, or words in the commit message
2.4.2 first para unfinished
author Zhaoping Sun <zhaopingsun@gmail.com>
date Fri Nov 20 23:21:46 2009 -0500 (2009-11-20)
parents
children
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/it/examples/ch04-resolve.merge.it	Fri Nov 20 23:21:46 2009 -0500
     1.3 @@ -0,0 +1,9 @@
     1.4 +<!-- BEGIN ch04/resolve.merge -->
     1.5 +<screen><prompt>$</prompt> <userinput>hg merge</userinput>
     1.6 +unisco miofile.txt
     1.7 +merge: attenzione: conflitti durante l'unione
     1.8 +unione di miofile.txt fallita!
     1.9 +0 file aggiornati, 0 file uniti, 0 file rimossi, 1 file irrisolti
    1.10 +usate 'hg resolve' per riprovare a unire i file irrisolti o 'hg up --clean' per abbandonare
    1.11 +</screen>
    1.12 +<!-- END ch04/resolve.merge -->