bos@611: <!-- BEGIN tour-merge-conflict.commit -->
bos@564: <screen><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 Bryan O'Sullivan, no relation of 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 resolve -m letter.txt</userinput>
bos@564: <prompt>$</prompt> <userinput>hg commit -m 'Send me your money'</userinput>
bos@564: <prompt>$</prompt> <userinput>hg tip</userinput>
bos@144: changeset:   
bos@144: tag:         tip
bos@144: parent:      
bos@144: parent:      
bos@564: user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
bos@144: 
bos@144: summary:     Send me your money
bos@144: 
bos@564: </screen>
bos@611: <!-- END tour-merge-conflict.commit -->