diff en/examples/results/branching.merge.out @ 663:0d5935744f87

Switch from LaTeX to XML for examples.

--- a/en/examples/results/branching.merge.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/branching.merge.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,5 +1,5 @@
-$ \textbf{cd ../main}
-$ \textbf{hg pull ../stable}
+<screen><prompt>$</prompt> <userinput>cd ../main</userinput>
+<prompt>$</prompt> <userinput>hg pull ../stable</userinput>
 pulling from ../stable
 searching for changes
 adding changesets
@@ -7,11 +7,12 @@
 adding file changes
 added 1 changesets with 1 changes to 1 files (+1 heads)
 (run 'hg heads' to see heads, 'hg merge' to merge)
-$ \textbf{hg merge}
+<prompt>$</prompt> <userinput>hg merge</userinput>
 merging myfile
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
-$ \textbf{hg commit -m 'Bring in bugfix from stable branch'}
-$ \textbf{cat myfile}
+<prompt>$</prompt> <userinput>hg commit -m 'Bring in bugfix from stable branch'</userinput>
+<prompt>$</prompt> <userinput>cat myfile</userinput>
 This is a fix to a boring feature.
 This is exciting and new!
+</screen>