Mercurial > hgbook

diff 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 diff
--- a/en/examples/results/tour-merge-conflict.commit.out	Tue Mar 31 12:18:22 2009 -0700
+++ b/en/examples/results/tour-merge-conflict.commit.out	Tue Mar 31 12:19:01 2009 -0700
@@ -1,3 +1,4 @@
+<!-- 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>
@@ -15,3 +16,4 @@
 summary:     Send me your money
 
 </screen>
+<!-- END tour-merge-conflict.commit -->