belaran@976: <!-- BEGIN tour-merge-conflict.merge -->
belaran@976: <screen><prompt>$</prompt> <userinput>export HGMERGE=merge</userinput>
belaran@976: <prompt>$</prompt> <userinput>hg merge</userinput>
belaran@976: unisco lettera.txt
belaran@976: merge: attenzione: conflitti durante l'unione
belaran@976: unione di lettera.txt fallita!
belaran@976: 0 file aggiornati, 0 file uniti, 0 file rimossi, 1 file irrisolti
belaran@976: usate 'hg resolve' per riprovare a unire i file irrisolti o 'hg up --clean' per abbandonare
belaran@976: <prompt>$</prompt> <userinput>cat lettera.txt</userinput>
belaran@976: Salve!
belaran@976: &lt;&lt;&lt;&lt;&lt;&lt;&lt; /tmp/panoramica-unioni-conflitto/truffa-unione/lettera.txt
belaran@976: Sono Shehu Musa Abacha, cugino dell'ex
belaran@976: =======
belaran@976: Sono Alhaji Abba Abacha, figlio dell'ex
belaran@976: &gt;&gt;&gt;&gt;&gt;&gt;&gt; /tmp/lettera.txt~other.01poS4
belaran@976: dittatore nigeriano Sani Abacha.
belaran@976: </screen>
belaran@976: <!-- END tour-merge-conflict.merge -->