Mercurial > hgbook

annotate en/examples/results/tour-merge-conflict.commit.out @ 709:4432ad34b8e5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Check in example outputs with begin/end markers.
author Bryan O'Sullivan <bos@serpentine.com>
date Tue, 31 Mar 2009 12:19:01 -0700
parents 0d5935744f87
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
709
4432ad34b8e5 Check in example outputs with begin/end markers.
Bryan O'Sullivan <bos@serpentine.com>
parents: 663
diff changeset
1 <!-- BEGIN tour-merge-conflict.commit -->
663
0d5935744f87 Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 662
diff changeset
2 <screen><prompt>$</prompt> <userinput>cat &gt; letter.txt &lt;&lt;EOF</userinput>
0d5935744f87 Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 662
diff changeset
3 <prompt>></prompt> <userinput>Greetings!</userinput>
0d5935744f87 Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 662
diff changeset
4 <prompt>></prompt> <userinput>I am Bryan O'Sullivan, no relation of the former</userinput>
0d5935744f87 Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 662
diff changeset
5 <prompt>></prompt> <userinput>Nigerian dictator Sani Abacha.</userinput>
0d5935744f87 Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 662
diff changeset
6 <prompt>></prompt> <userinput>EOF</userinput>
0d5935744f87 Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 662
diff changeset
7 <prompt>$</prompt> <userinput>hg resolve -m letter.txt</userinput>
0d5935744f87 Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 662
diff changeset
8 <prompt>$</prompt> <userinput>hg commit -m 'Send me your money'</userinput>
0d5935744f87 Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 662
diff changeset
9 <prompt>$</prompt> <userinput>hg tip</userinput>
144
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
10 changeset:
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
11 tag: tip
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
12 parent:
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
13 parent:
663
0d5935744f87 Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 662
diff changeset
14 user: Bryan O'Sullivan &lt;bos@serpentine.com&gt;
144
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
15
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
16 summary: Send me your money
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
17
663
0d5935744f87 Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 662
diff changeset
18 </screen>
709
4432ad34b8e5 Check in example outputs with begin/end markers.
Bryan O'Sullivan <bos@serpentine.com>
parents: 663
diff changeset
19 <!-- END tour-merge-conflict.commit -->