annotate en/examples/results/tour-merge-conflict.commit.out @ 609:c44d5854620b
Fix up chapter 1.
| author |
Bryan O'Sullivan <bos@serpentine.com> |
| date |
Tue Mar 31 22:38:30 2009 -0700 (2009-03-31) |
| parents |
44d1363234d2 |
| children |
4432ad34b8e5 |
| rev |
line source |
|
bos@564
|
1 <screen><prompt>$</prompt> <userinput>cat > letter.txt <<EOF</userinput>
|
|
bos@564
|
2 <prompt>></prompt> <userinput>Greetings!</userinput>
|
|
bos@564
|
3 <prompt>></prompt> <userinput>I am Bryan O'Sullivan, no relation of the former</userinput>
|
|
bos@564
|
4 <prompt>></prompt> <userinput>Nigerian dictator Sani Abacha.</userinput>
|
|
bos@564
|
5 <prompt>></prompt> <userinput>EOF</userinput>
|
|
bos@564
|
6 <prompt>$</prompt> <userinput>hg resolve -m letter.txt</userinput>
|
|
bos@564
|
7 <prompt>$</prompt> <userinput>hg commit -m 'Send me your money'</userinput>
|
|
bos@564
|
8 <prompt>$</prompt> <userinput>hg tip</userinput>
|
|
bos@144
|
9 changeset:
|
|
bos@144
|
10 tag: tip
|
|
bos@144
|
11 parent:
|
|
bos@144
|
12 parent:
|
|
bos@564
|
13 user: Bryan O'Sullivan <bos@serpentine.com>
|
|
bos@144
|
14
|
|
bos@144
|
15 summary: Send me your money
|
|
bos@144
|
16
|
|
bos@564
|
17 </screen>
|
