view en/examples/results/tour-merge-conflict.cousin.out @ 668:60ee738fdc0e

Fix quoting of entity declarations.
author Bryan O'Sullivan <bos@serpentine.com>
date Mon, 09 Mar 2009 23:32:15 -0700
parents 0d5935744f87
children 4432ad34b8e5
line wrap: on
line source

<screen><prompt>$</prompt> <userinput>cd ..</userinput>
<prompt>$</prompt> <userinput>hg clone scam scam-cousin</userinput>
updating working directory
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
<prompt>$</prompt> <userinput>cd scam-cousin</userinput>
<prompt>$</prompt> <userinput>cat &gt; letter.txt &lt;&lt;EOF</userinput>
<prompt>></prompt> <userinput>Greetings!</userinput>
<prompt>></prompt> <userinput>I am Shehu Musa Abacha, cousin to 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 cousin'</userinput>
</screen>