hgbook
view it/examples/tour-merge-conflict.commit.it @ 785:0bf0bf61493e
Minor changes and translation of code snippets for Ch.3.
| author | Giulio@puck |
|---|---|
| date | Mon Aug 10 21:59:18 2009 +0200 (2009-08-10) |
| parents | |
| children | 11a6ba60bb9e |
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 tag: tip
12 parent: 1:ae14113af250
13 parent: 2:11ab3b2b6d1b
14 user: Bryan O'Sullivan <bos@serpentine.com>
15 date: Fri Jun 05 15:52:13 2009 +0000
16 summary: Mandatemi i vostri soldi
18 </screen>
19 <!-- END tour-merge-conflict.commit -->