Mercurial > hgbook

comparison en/examples/results/tour-merge-conflict.commit.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
comparison
equal deleted inserted replaced
662:44d1363234d2 663:0d5935744f87
1 $ \textbf{cat > letter.txt <<EOF} 1 <screen><prompt>$</prompt> <userinput>cat &gt; letter.txt &lt;&lt;EOF</userinput>
2 > \textbf{Greetings!} 2 <prompt>></prompt> <userinput>Greetings!</userinput>
3 > \textbf{I am Bryan O'Sullivan, no relation of the former} 3 <prompt>></prompt> <userinput>I am Bryan O'Sullivan, no relation of the former</userinput>
4 > \textbf{Nigerian dictator Sani Abacha.} 4 <prompt>></prompt> <userinput>Nigerian dictator Sani Abacha.</userinput>
5 > \textbf{EOF} 5 <prompt>></prompt> <userinput>EOF</userinput>
6 $ \textbf{hg resolve -m letter.txt} 6 <prompt>$</prompt> <userinput>hg resolve -m letter.txt</userinput>
7 $ \textbf{hg commit -m 'Send me your money'} 7 <prompt>$</prompt> <userinput>hg commit -m 'Send me your money'</userinput>
8 $ \textbf{hg tip} 8 <prompt>$</prompt> <userinput>hg tip</userinput>
9 changeset: 9 changeset:
10 tag: tip 10 tag: tip
11 parent: 11 parent:
12 parent: 12 parent:
13 user: Bryan O'Sullivan <bos@serpentine.com> 13 user: Bryan O'Sullivan &lt;bos@serpentine.com&gt;
14 14
15 summary: Send me your money 15 summary: Send me your money
16 16
17 </screen>