hgbook / it / examples / tour-merge-conflict.merge.it

<!-- BEGIN tour-merge-conflict.merge -->
<screen><prompt>$</prompt> <userinput>export HGMERGE=merge</userinput>
<prompt>$</prompt> <userinput>hg merge</userinput>
unisco lettera.txt
merge: attenzione: conflitti durante l'unione
unione di lettera.txt fallita!
0 file aggiornati, 0 file uniti, 0 file rimossi, 1 file irrisolti
usate 'hg resolve' per riprovare a unire i file irrisolti o 'hg up --clean' per abbandonare
<prompt>$</prompt> <userinput>cat lettera.txt</userinput>
Salve!
&lt;&lt;&lt;&lt;&lt;&lt;&lt; /tmp/panoramica-unioni-conflitto/truffa-unione/lettera.txt
Sono Shehu Musa Abacha, cugino dell'ex
=======
Sono Alhaji Abba Abacha, figlio dell'ex
&gt;&gt;&gt;&gt;&gt;&gt;&gt; /tmp/lettera.txt~other.01poS4
dittatore nigeriano Sani Abacha.
</screen>
<!-- END tour-merge-conflict.merge -->
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.