Giulio@785: <!-- BEGIN tour-merge-conflict.commit -->
Giulio@785: <screen><prompt>$</prompt> <userinput>cat &gt; lettera.txt &lt;&lt;EOF</userinput>
Giulio@785: <prompt>></prompt> <userinput>Salve!</userinput>
Giulio@785: <prompt>></prompt> <userinput>Sono Bryan O'Sullivan, nessuna parentela con l'ex</userinput>
Giulio@785: <prompt>></prompt> <userinput>dittatore nigeriano Sani Abacha.</userinput>
Giulio@785: <prompt>></prompt> <userinput>EOF</userinput>
Giulio@785: <prompt>$</prompt> <userinput>hg resolve -m lettera.txt</userinput>
Giulio@785: <prompt>$</prompt> <userinput>hg commit -m 'Mandatemi i vostri soldi'</userinput>
Giulio@785: <prompt>$</prompt> <userinput>hg tip</userinput>
Giulio@785: changeset:   3:df19ae0ef4d4
Giulio@785: tag:         tip
Giulio@785: parent:      1:ae14113af250
Giulio@785: parent:      2:11ab3b2b6d1b
Giulio@785: user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
Giulio@785: date:        Fri Jun 05 15:52:13 2009 +0000
Giulio@785: summary:     Mandatemi i vostri soldi
Giulio@785: 
Giulio@785: </screen>
Giulio@785: <!-- END tour-merge-conflict.commit -->