hgbook

annotate it/examples/tour-merge-conflict.commit.it @ 836:11a6ba60bb9e

find changesets by author, revision, files, or words in the commit message
Final editing for chapters 0-3.
author gpiancastelli
date Wed Aug 19 19:39:24 2009 +0200 (2009-08-19)
parents 0bf0bf61493e
children 719b03ea27c8
rev   line source
Giulio@785 1 <!-- BEGIN tour-merge-conflict.commit -->
Giulio@785 2 <screen><prompt>$</prompt> <userinput>cat &gt; lettera.txt &lt;&lt;EOF</userinput>
Giulio@785 3 <prompt>></prompt> <userinput>Salve!</userinput>
Giulio@785 4 <prompt>></prompt> <userinput>Sono Bryan O'Sullivan, nessuna parentela con l'ex</userinput>
Giulio@785 5 <prompt>></prompt> <userinput>dittatore nigeriano Sani Abacha.</userinput>
Giulio@785 6 <prompt>></prompt> <userinput>EOF</userinput>
Giulio@785 7 <prompt>$</prompt> <userinput>hg resolve -m lettera.txt</userinput>
Giulio@785 8 <prompt>$</prompt> <userinput>hg commit -m 'Mandatemi i vostri soldi'</userinput>
Giulio@785 9 <prompt>$</prompt> <userinput>hg tip</userinput>
Giulio@785 10 changeset: 3:df19ae0ef4d4
gpiancastelli@836 11 etichetta: tip
gpiancastelli@836 12 genitore: 1:ae14113af250
gpiancastelli@836 13 genitore: 2:11ab3b2b6d1b
gpiancastelli@836 14 utente: Bryan O'Sullivan &lt;bos@serpentine.com&gt;
gpiancastelli@836 15 data: Fri Jun 05 15:52:13 2009 +0000
gpiancastelli@836 16 sommario: Mandatemi i vostri soldi
Giulio@785 17
Giulio@785 18 </screen>
Giulio@785 19 <!-- END tour-merge-conflict.commit -->