hgbook
annotate it/examples/tour-merge-conflict.merge.it @ 1114:527b86d55d4a
inotify: update installation information
inotify is shipped in Mercurial since 1.0, which greatly simplifies the installation process
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 |
| rev | line source |
|---|---|
| Giulio@785 | 1 <!-- BEGIN tour-merge-conflict.merge --> |
| Giulio@785 | 2 <screen><prompt>$</prompt> <userinput>export HGMERGE=merge</userinput> |
| Giulio@785 | 3 <prompt>$</prompt> <userinput>hg merge</userinput> |
| Giulio@785 | 4 unisco lettera.txt |
| Giulio@785 | 5 merge: attenzione: conflitti durante l'unione |
| Giulio@785 | 6 unione di lettera.txt fallita! |
| Giulio@785 | 7 0 file aggiornati, 0 file uniti, 0 file rimossi, 1 file irrisolti |
| Giulio@789 | 8 usate 'hg resolve' per riprovare a unire i file irrisolti o 'hg up --clean' per abbandonare |
| Giulio@785 | 9 <prompt>$</prompt> <userinput>cat lettera.txt</userinput> |
| Giulio@785 | 10 Salve! |
| Giulio@785 | 11 <<<<<<< /tmp/panoramica-unioni-conflitto/truffa-unione/lettera.txt |
| Giulio@785 | 12 Sono Shehu Musa Abacha, cugino dell'ex |
| Giulio@785 | 13 ======= |
| Giulio@785 | 14 Sono Alhaji Abba Abacha, figlio dell'ex |
| Giulio@785 | 15 >>>>>>> /tmp/lettera.txt~other.01poS4 |
| Giulio@785 | 16 dittatore nigeriano Sani Abacha. |
| Giulio@785 | 17 </screen> |
| Giulio@785 | 18 <!-- END tour-merge-conflict.merge --> |