Mercurial > hgbook

comparison 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
comparison
equal deleted inserted replaced
708:c82ff69f0935 709:4432ad34b8e5
1 <!-- BEGIN tour-merge-conflict.commit -->
1 <screen><prompt>$</prompt> <userinput>cat &gt; letter.txt &lt;&lt;EOF</userinput> 2 <screen><prompt>$</prompt> <userinput>cat &gt; letter.txt &lt;&lt;EOF</userinput>
2 <prompt>></prompt> <userinput>Greetings!</userinput> 3 <prompt>></prompt> <userinput>Greetings!</userinput>
3 <prompt>></prompt> <userinput>I am Bryan O'Sullivan, no relation of the former</userinput> 4 <prompt>></prompt> <userinput>I am Bryan O'Sullivan, no relation of the former</userinput>
4 <prompt>></prompt> <userinput>Nigerian dictator Sani Abacha.</userinput> 5 <prompt>></prompt> <userinput>Nigerian dictator Sani Abacha.</userinput>
5 <prompt>></prompt> <userinput>EOF</userinput> 6 <prompt>></prompt> <userinput>EOF</userinput>
13 user: Bryan O'Sullivan &lt;bos@serpentine.com&gt; 14 user: Bryan O'Sullivan &lt;bos@serpentine.com&gt;
14 15
15 summary: Send me your money 16 summary: Send me your money
16 17
17 </screen> 18 </screen>
19 <!-- END tour-merge-conflict.commit -->