hgbook

view it/examples/tour-merge-conflict.merge.it @ 1114:527b86d55d4a

find changesets by author, revision, files, or words in the commit message
inotify: update installation information

inotify is shipped in Mercurial since 1.0, which greatly simplifies the installation process
author Nicolas Dumazet <nicdumz.commits@gmail.com>
date Sun Dec 13 16:35:56 2009 +0900 (2009-12-13)
parents 713f0f69029a a419faec3428
children
line source
1 <!-- BEGIN tour-merge-conflict.merge -->
2 <screen><prompt>$</prompt> <userinput>export HGMERGE=merge</userinput>
3 <prompt>$</prompt> <userinput>hg merge</userinput>
4 unisco lettera.txt
5 merge: attenzione: conflitti durante l'unione
6 unione di lettera.txt fallita!
7 0 file aggiornati, 0 file uniti, 0 file rimossi, 1 file irrisolti
8 usate 'hg resolve' per riprovare a unire i file irrisolti o 'hg up --clean' per abbandonare
9 <prompt>$</prompt> <userinput>cat lettera.txt</userinput>
10 Salve!
11 &lt;&lt;&lt;&lt;&lt;&lt;&lt; /tmp/panoramica-unioni-conflitto/truffa-unione/lettera.txt
12 Sono Shehu Musa Abacha, cugino dell'ex
13 =======
14 Sono Alhaji Abba Abacha, figlio dell'ex
15 &gt;&gt;&gt;&gt;&gt;&gt;&gt; /tmp/lettera.txt~other.01poS4
16 dittatore nigeriano Sani Abacha.
17 </screen>
18 <!-- END tour-merge-conflict.merge -->