bos@611: <!-- BEGIN tour-merge-conflict.cousin -->
bos@564: <screen><prompt>$</prompt> <userinput>cd ..</userinput>
bos@564: <prompt>$</prompt> <userinput>hg clone scam scam-cousin</userinput>
hg@302: updating working directory
bos@144: 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
bos@564: <prompt>$</prompt> <userinput>cd scam-cousin</userinput>
bos@564: <prompt>$</prompt> <userinput>cat &gt; letter.txt &lt;&lt;EOF</userinput>
bos@564: <prompt>></prompt> <userinput>Greetings!</userinput>
bos@564: <prompt>></prompt> <userinput>I am Shehu Musa Abacha, cousin to the former</userinput>
bos@564: <prompt>></prompt> <userinput>Nigerian dictator Sani Abacha.</userinput>
bos@564: <prompt>></prompt> <userinput>EOF</userinput>
bos@564: <prompt>$</prompt> <userinput>hg commit -m '419 scam, with cousin'</userinput>
bos@564: </screen>
bos@611: <!-- END tour-merge-conflict.cousin -->