Source

hgbook-de / it / examples / tour-merge-conflict.commit.it

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

</screen>
<!-- END tour-merge-conflict.commit -->