belaran@976: <!-- BEGIN tour-merge-conflict.wife -->
belaran@976: <screen><prompt>$</prompt> <userinput>cat &gt; lettera.txt &lt;&lt;EOF</userinput>
belaran@976: <prompt>></prompt> <userinput>Salve!</userinput>
belaran@976: <prompt>></prompt> <userinput>Sono Mariam Abacha, moglie dell'ex</userinput>
belaran@976: <prompt>></prompt> <userinput>dittatore nigeriano Sani Abacha.</userinput>
belaran@976: <prompt>></prompt> <userinput>EOF</userinput>
belaran@976: <prompt>$</prompt> <userinput>hg add lettera.txt</userinput>
belaran@976: <prompt>$</prompt> <userinput>hg commit -m 'truffa 419, prima bozza'</userinput>
belaran@976: </screen>
belaran@976: <!-- END tour-merge-conflict.wife -->