Mercurial > hgbook

comparison en/examples/results/tour-merge-conflict.son.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{cd ..} 1 <screen><prompt>$</prompt> <userinput>cd ..</userinput>
2 $ \textbf{hg clone scam scam-son} 2 <prompt>$</prompt> <userinput>hg clone scam scam-son</userinput>
3 updating working directory 3 updating working directory
4 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 4 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
5 $ \textbf{cd scam-son} 5 <prompt>$</prompt> <userinput>cd scam-son</userinput>
6 $ \textbf{cat > letter.txt <<EOF} 6 <prompt>$</prompt> <userinput>cat &gt; letter.txt &lt;&lt;EOF</userinput>
7 > \textbf{Greetings!} 7 <prompt>></prompt> <userinput>Greetings!</userinput>
8 > \textbf{I am Alhaji Abba Abacha, son of the former} 8 <prompt>></prompt> <userinput>I am Alhaji Abba Abacha, son of the former</userinput>
9 > \textbf{Nigerian dictator Sani Abacha.} 9 <prompt>></prompt> <userinput>Nigerian dictator Sani Abacha.</userinput>
10 > \textbf{EOF} 10 <prompt>></prompt> <userinput>EOF</userinput>
11 $ \textbf{hg commit -m '419 scam, with son'} 11 <prompt>$</prompt> <userinput>hg commit -m '419 scam, with son'</userinput>
12 </screen>