belaran@976: <!-- BEGIN tour-merge-conflict.commit -->
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 Bryan O'Sullivan, nessuna parentela con l'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 resolve -m lettera.txt</userinput>
belaran@976: <prompt>$</prompt> <userinput>hg commit -m 'Mandatemi i vostri soldi'</userinput>
belaran@976: <prompt>$</prompt> <userinput>hg tip</userinput>
belaran@976: changeset:   3:df19ae0ef4d4
belaran@976: etichetta:   tip
belaran@976: genitore:    1:ae14113af250
belaran@976: genitore:    2:11ab3b2b6d1b
belaran@976: utente:      Bryan O'Sullivan &lt;bos@serpentine.com&gt;
belaran@976: data:        Fri Jun 05 15:52:13 2009 +0000
belaran@976: sommario:    Mandatemi i vostri soldi
belaran@976: 
belaran@976: </screen>
belaran@976: <!-- END tour-merge-conflict.commit -->