Mercurial > hgbook

view en/examples/results/tour-merge-conflict.merge.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.merge -->
<screen><prompt>$</prompt> <userinput>export HGMERGE=merge</userinput>
<prompt>$</prompt> <userinput>echo 'XXX this is broken and must be fixed'</userinput>
XXX this is broken and must be fixed
<prompt>$</prompt> <userinput>hg merge</userinput>
merging letter.txt
merge: warning: conflicts during merge
merging letter.txt failed!
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
<prompt>$</prompt> <userinput>cat letter.txt</userinput>
Greetings!
&lt;&lt;&lt;&lt;&lt;&lt;&lt; /tmp/tour-merge-conflictP17yO-/scam-merge/letter.txt
I am Shehu Musa Abacha, cousin to the former
=======
I am Alhaji Abba Abacha, son of the former
&gt;&gt;&gt;&gt;&gt;&gt;&gt; /tmp/letter.txt~other.EVdwH3
Nigerian dictator Sani Abacha.
</screen>
<!-- END tour-merge-conflict.merge -->