annotate it/examples/tour-merge-conflict.commit.it @ 791:bf84d6b2281c
Minor changes and translation of code snippets for Ch.7.
| author |
Giulio@puck |
| date |
Tue Aug 11 23:01:30 2009 +0200 (2009-08-11) |
| parents |
|
| children |
11a6ba60bb9e |
| rev |
line source |
|
Giulio@785
|
1 <!-- BEGIN tour-merge-conflict.commit -->
|
|
Giulio@785
|
2 <screen><prompt>$</prompt> <userinput>cat > lettera.txt <<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
|
|
Giulio@785
|
11 tag: tip
|
|
Giulio@785
|
12 parent: 1:ae14113af250
|
|
Giulio@785
|
13 parent: 2:11ab3b2b6d1b
|
|
Giulio@785
|
14 user: Bryan O'Sullivan <bos@serpentine.com>
|
|
Giulio@785
|
15 date: Fri Jun 05 15:52:13 2009 +0000
|
|
Giulio@785
|
16 summary: Mandatemi i vostri soldi
|
|
Giulio@785
|
17
|
|
Giulio@785
|
18 </screen>
|
|
Giulio@785
|
19 <!-- END tour-merge-conflict.commit -->
|
