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

Check in example outputs with begin/end markers.

--- a/en/examples/results/tour-merge-conflict.merge.out	Tue Mar 31 12:18:22 2009 -0700
+++ b/en/examples/results/tour-merge-conflict.merge.out	Tue Mar 31 12:19:01 2009 -0700
@@ -1,3 +1,4 @@
+<!-- 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
@@ -6,13 +7,14 @@
 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
+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-conflictBrdfE0/scam-merge/letter.txt
+&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.1ctEYy
+&gt;&gt;&gt;&gt;&gt;&gt;&gt; /tmp/letter.txt~other.EVdwH3
 Nigerian dictator Sani Abacha.
 </screen>
+<!-- END tour-merge-conflict.merge -->