diff en/examples/results/tour-merge-conflict.son.out @ 663:0d5935744f87

Switch from LaTeX to XML for examples.

--- a/en/examples/results/tour-merge-conflict.son.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/tour-merge-conflict.son.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,11 +1,12 @@
-$ \textbf{cd ..}
-$ \textbf{hg clone scam scam-son}
+<screen><prompt>$</prompt> <userinput>cd ..</userinput>
+<prompt>$</prompt> <userinput>hg clone scam scam-son</userinput>
 updating working directory
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-$ \textbf{cd scam-son}
-$ \textbf{cat > letter.txt <<EOF}
-> \textbf{Greetings!}
-> \textbf{I am Alhaji Abba Abacha, son of the former}
-> \textbf{Nigerian dictator Sani Abacha.}
-> \textbf{EOF}
-$ \textbf{hg commit -m '419 scam, with son'}
+<prompt>$</prompt> <userinput>cd scam-son</userinput>
+<prompt>$</prompt> <userinput>cat &gt; letter.txt &lt;&lt;EOF</userinput>
+<prompt>></prompt> <userinput>Greetings!</userinput>
+<prompt>></prompt> <userinput>I am Alhaji Abba Abacha, son of the former</userinput>
+<prompt>></prompt> <userinput>Nigerian dictator Sani Abacha.</userinput>
+<prompt>></prompt> <userinput>EOF</userinput>
+<prompt>$</prompt> <userinput>hg commit -m '419 scam, with son'</userinput>
+</screen>