Mercurial > hgbook

view en/examples/results/tour-merge-conflict.commit.out @ 709:4432ad34b8e5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Check in example outputs with begin/end markers.
author Bryan O'Sullivan <bos@serpentine.com>
date Tue, 31 Mar 2009 12:19:01 -0700
parents 0d5935744f87
children
line wrap: on
line source

<!-- BEGIN tour-merge-conflict.commit -->
<screen><prompt>$</prompt> <userinput>cat &gt; letter.txt &lt;&lt;EOF</userinput>
<prompt>></prompt> <userinput>Greetings!</userinput>
<prompt>></prompt> <userinput>I am Bryan O'Sullivan, no relation of the former</userinput>
<prompt>></prompt> <userinput>Nigerian dictator Sani Abacha.</userinput>
<prompt>></prompt> <userinput>EOF</userinput>
<prompt>$</prompt> <userinput>hg resolve -m letter.txt</userinput>
<prompt>$</prompt> <userinput>hg commit -m 'Send me your money'</userinput>
<prompt>$</prompt> <userinput>hg tip</userinput>
changeset:   
tag:         tip
parent:      
parent:      
user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;

summary:     Send me your money

</screen>
<!-- END tour-merge-conflict.commit -->