annotate it/examples/tour-merge-conflict.wife.it @ 836:11a6ba60bb9e
Final editing for chapters 0-3.
author |
gpiancastelli |
date |
Wed Aug 19 19:39:24 2009 +0200 (2009-08-19) |
parents |
4142ed700d56 |
children |
719b03ea27c8 |
rev |
line source |
Giulio@785
|
1 <!-- BEGIN tour-merge-conflict.wife -->
|
Giulio@785
|
2 <screen><prompt>$</prompt> <userinput>cat > lettera.txt <<EOF</userinput>
|
Giulio@785
|
3 <prompt>></prompt> <userinput>Salve!</userinput>
|
gpiancastelli@834
|
4 <prompt>></prompt> <userinput>Sono Mariam Abacha, moglie dell'ex</userinput>
|
Giulio@785
|
5 <prompt>></prompt> <userinput>dittatore nigeriano Sani Abacha.</userinput>
|
Giulio@785
|
6 <prompt>></prompt> <userinput>EOF</userinput>
|
gpiancastelli@836
|
7 <prompt>$</prompt> <userinput>hg add lettera.txt</userinput>
|
Giulio@785
|
8 <prompt>$</prompt> <userinput>hg commit -m 'truffa 419, prima bozza'</userinput>
|
Giulio@785
|
9 </screen>
|
Giulio@785
|
10 <!-- END tour-merge-conflict.wife -->
|