1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/it/examples/tour-merge-conflict.commit.it	Fri Sep 04 16:33:35 2009 +0200
     1.3 @@ -0,0 +1,19 @@
     1.4 +<!-- BEGIN tour-merge-conflict.commit -->
     1.5 +<screen><prompt>$</prompt> <userinput>cat &gt; lettera.txt &lt;&lt;EOF</userinput>
     1.6 +<prompt>></prompt> <userinput>Salve!</userinput>
     1.7 +<prompt>></prompt> <userinput>Sono Bryan O'Sullivan, nessuna parentela con l'ex</userinput>
     1.8 +<prompt>></prompt> <userinput>dittatore nigeriano Sani Abacha.</userinput>
     1.9 +<prompt>></prompt> <userinput>EOF</userinput>
    1.10 +<prompt>$</prompt> <userinput>hg resolve -m lettera.txt</userinput>
    1.11 +<prompt>$</prompt> <userinput>hg commit -m 'Mandatemi i vostri soldi'</userinput>
    1.12 +<prompt>$</prompt> <userinput>hg tip</userinput>
    1.13 +changeset:   3:df19ae0ef4d4
    1.14 +etichetta:   tip
    1.15 +genitore:    1:ae14113af250
    1.16 +genitore:    2:11ab3b2b6d1b
    1.17 +utente:      Bryan O'Sullivan &lt;bos@serpentine.com&gt;
    1.18 +data:        Fri Jun 05 15:52:13 2009 +0000
    1.19 +sommario:    Mandatemi i vostri soldi
    1.20 +
    1.21 +</screen>
    1.22 +<!-- END tour-merge-conflict.commit -->