Mercurial > hgbook

annotate en/examples/results/tour-merge-conflict.cousin.out @ 663:0d5935744f87

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Switch from LaTeX to XML for examples.
author Bryan O'Sullivan <bos@serpentine.com>
date Mon, 09 Mar 2009 21:39:23 -0700
parents 44d1363234d2
children 4432ad34b8e5
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
663
0d5935744f87 Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 662
diff changeset
1 <screen><prompt>$</prompt> <userinput>cd ..</userinput>
0d5935744f87 Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 662
diff changeset
2 <prompt>$</prompt> <userinput>hg clone scam scam-cousin</userinput>
401
e281bd9a8e47 Fix sample output for test 'tour-merge-conflict'.
Guido Ostkamp <hg@ostkamp.fastmail.fm>
parents: 144
diff changeset
3 updating working directory
144
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
4 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
663
0d5935744f87 Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 662
diff changeset
5 <prompt>$</prompt> <userinput>cd scam-cousin</userinput>
0d5935744f87 Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 662
diff changeset
6 <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
7 <prompt>></prompt> <userinput>Greetings!</userinput>
0d5935744f87 Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 662
diff changeset
8 <prompt>></prompt> <userinput>I am Shehu Musa Abacha, cousin to the former</userinput>
0d5935744f87 Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 662
diff changeset
9 <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
10 <prompt>></prompt> <userinput>EOF</userinput>
0d5935744f87 Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 662
diff changeset
11 <prompt>$</prompt> <userinput>hg commit -m '419 scam, with cousin'</userinput>
0d5935744f87 Switch from LaTeX to XML for examples.
Bryan O'Sullivan <bos@serpentine.com>
parents: 662
diff changeset
12 </screen>