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