hgbook: cd06c45e1631 it/examples/ch04-resolve.merge.it

hgbook

French translation : ch06-collab.xml - about 50% translated

author	Frédéric Bouquet <youshe.jaalon@gmail.com>
date	Mon Sep 21 00:02:10 2009 +0200 (2009-09-21)
parents
children

line source

1

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