hgbook
annotate it/examples/tour-merge-conflict.merge.it @ 976:713f0f69029a
merge with Italian, and very (few) work on ch03
| author | Romain PELISSE <belaran@gmail.com> |
|---|---|
| date | Fri Sep 04 16:33:35 2009 +0200 (2009-09-04) |
| parents | |
| children | 719b03ea27c8 |
| rev | line source |
|---|---|
| belaran@976 | 1 <!-- BEGIN tour-merge-conflict.merge --> |
| belaran@976 | 2 <screen><prompt>$</prompt> <userinput>export HGMERGE=merge</userinput> |
| belaran@976 | 3 <prompt>$</prompt> <userinput>hg merge</userinput> |
| belaran@976 | 4 unisco lettera.txt |
| belaran@976 | 5 merge: attenzione: conflitti durante l'unione |
| belaran@976 | 6 unione di lettera.txt fallita! |
| belaran@976 | 7 0 file aggiornati, 0 file uniti, 0 file rimossi, 1 file irrisolti |
| belaran@976 | 8 usate 'hg resolve' per riprovare a unire i file irrisolti o 'hg up --clean' per abbandonare |
| belaran@976 | 9 <prompt>$</prompt> <userinput>cat lettera.txt</userinput> |
| belaran@976 | 10 Salve! |
| belaran@976 | 11 <<<<<<< /tmp/panoramica-unioni-conflitto/truffa-unione/lettera.txt |
| belaran@976 | 12 Sono Shehu Musa Abacha, cugino dell'ex |
| belaran@976 | 13 ======= |
| belaran@976 | 14 Sono Alhaji Abba Abacha, figlio dell'ex |
| belaran@976 | 15 >>>>>>> /tmp/lettera.txt~other.01poS4 |
| belaran@976 | 16 dittatore nigeriano Sani Abacha. |
| belaran@976 | 17 </screen> |
| belaran@976 | 18 <!-- END tour-merge-conflict.merge --> |