hgbook

view it/examples/tour-merge-conflict.wife.it @ 834:4142ed700d56

Typo.
author gpiancastelli
date Tue Aug 18 17:42:16 2009 +0200 (2009-08-18)
parents 0bf0bf61493e
children 11a6ba60bb9e
line source
1 <!-- BEGIN tour-merge-conflict.wife -->
2 <screen><prompt>$</prompt> <userinput>cat &gt; lettera.txt &lt;&lt;EOF</userinput>
3 <prompt>></prompt> <userinput>Salve!</userinput>
4 <prompt>></prompt> <userinput>Sono Mariam Abacha, moglie dell'ex</userinput>
5 <prompt>></prompt> <userinput>dittatore nigeriano Sani Abacha.</userinput>
6 <prompt>></prompt> <userinput>EOF</userinput>
7 <prompt>$</prompt> <userinput>hg add letter.txt</userinput>
8 <prompt>$</prompt> <userinput>hg commit -m 'truffa 419, prima bozza'</userinput>
9 </screen>
10 <!-- END tour-merge-conflict.wife -->