Mercurial > hgbook

view en/examples/results/tour-merge-conflict.son.out @ 744:1114da00d30e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix '<programlisting>' in ch02-tour-basic.xml
author Dongsheng Song <dongsheng.song@gmail.com>
date Wed, 18 Mar 2009 19:43:46 +0800
parents 0d5935744f87
children 4432ad34b8e5
line wrap: on
line source

<screen><prompt>$</prompt> <userinput>cd ..</userinput>
<prompt>$</prompt> <userinput>hg clone scam scam-son</userinput>
updating working directory
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
<prompt>$</prompt> <userinput>cd scam-son</userinput>
<prompt>$</prompt> <userinput>cat &gt; letter.txt &lt;&lt;EOF</userinput>
<prompt>></prompt> <userinput>Greetings!</userinput>
<prompt>></prompt> <userinput>I am Alhaji Abba Abacha, son of the former</userinput>
<prompt>></prompt> <userinput>Nigerian dictator Sani Abacha.</userinput>
<prompt>></prompt> <userinput>EOF</userinput>
<prompt>$</prompt> <userinput>hg commit -m '419 scam, with son'</userinput>
</screen>