hgbook
view en/examples/results/tour-merge-conflict.commit.out @ 614:c8680784cdbb
Make builds more reliable.
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Tue Mar 31 15:35:44 2009 -0700 (2009-03-31) |
| parents | 0d5935744f87 |
| children |
line source
1 <!-- BEGIN tour-merge-conflict.commit -->
2 <screen><prompt>$</prompt> <userinput>cat > letter.txt <<EOF</userinput>
3 <prompt>></prompt> <userinput>Greetings!</userinput>
4 <prompt>></prompt> <userinput>I am Bryan O'Sullivan, no relation of the former</userinput>
5 <prompt>></prompt> <userinput>Nigerian dictator Sani Abacha.</userinput>
6 <prompt>></prompt> <userinput>EOF</userinput>
7 <prompt>$</prompt> <userinput>hg resolve -m letter.txt</userinput>
8 <prompt>$</prompt> <userinput>hg commit -m 'Send me your money'</userinput>
9 <prompt>$</prompt> <userinput>hg tip</userinput>
10 changeset:
11 tag: tip
12 parent:
13 parent:
14 user: Bryan O'Sullivan <bos@serpentine.com>
16 summary: Send me your money
18 </screen>
19 <!-- END tour-merge-conflict.commit -->