hgbook
view 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 |
line source
1 <screen><prompt>$</prompt> <userinput>cat > letter.txt <<EOF</userinput>
2 <prompt>></prompt> <userinput>Greetings!</userinput>
3 <prompt>></prompt> <userinput>I am Bryan O'Sullivan, no relation of the former</userinput>
4 <prompt>></prompt> <userinput>Nigerian dictator Sani Abacha.</userinput>
5 <prompt>></prompt> <userinput>EOF</userinput>
6 <prompt>$</prompt> <userinput>hg resolve -m letter.txt</userinput>
7 <prompt>$</prompt> <userinput>hg commit -m 'Send me your money'</userinput>
8 <prompt>$</prompt> <userinput>hg tip</userinput>
9 changeset:
10 tag: tip
11 parent:
12 parent:
13 user: Bryan O'Sullivan <bos@serpentine.com>
15 summary: Send me your money
17 </screen>