annotate it/examples/tour-merge-conflict.son.it @ 1113:613690ad6a9c
Merge with dongsheng
| author |
Bryan O'Sullivan <bos@serpentine.com> |
| date |
Sat Jul 10 16:21:26 2010 +0100 (2010-07-10) |
| parents |
|
| children |
|
| rev |
line source |
|
Giulio@785
|
1 <!-- BEGIN tour-merge-conflict.son -->
|
|
Giulio@785
|
2 <screen><prompt>$</prompt> <userinput>cd ..</userinput>
|
|
Giulio@785
|
3 <prompt>$</prompt> <userinput>hg clone truffa truffa-figlio</userinput>
|
|
Giulio@785
|
4 aggiorno la directory di lavoro
|
|
Giulio@785
|
5 1 file aggiornati, 0 file uniti, 0 file rimossi, 0 file irrisolti
|
|
Giulio@785
|
6 <prompt>$</prompt> <userinput>cd truffa-figlio</userinput>
|
|
Giulio@785
|
7 <prompt>$</prompt> <userinput>cat > lettera.txt <<EOF</userinput>
|
|
Giulio@785
|
8 <prompt>></prompt> <userinput>Salve!</userinput>
|
|
Giulio@785
|
9 <prompt>></prompt> <userinput>Sono Alhaji Abba Abacha, figlio dell'ex</userinput>
|
|
Giulio@785
|
10 <prompt>></prompt> <userinput>dittatore nigeriano Sani Abacha.</userinput>
|
|
Giulio@785
|
11 <prompt>></prompt> <userinput>EOF</userinput>
|
|
Giulio@785
|
12 <prompt>$</prompt> <userinput>hg commit -m 'truffa 419, con figlio'</userinput>
|
|
Giulio@785
|
13 </screen>
|
|
Giulio@785
|
14 <!-- END tour-merge-conflict.son -->
|
