Mercurial > hgbook

diff en/examples/results/branch-named.merge.out @ 663:0d5935744f87

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Switch from LaTeX to XML for examples.
author Bryan O'Sullivan <bos@serpentine.com>
date Mon, 09 Mar 2009 21:39:23 -0700
parents 44d1363234d2
children 4432ad34b8e5
line wrap: on
line diff
--- a/en/examples/results/branch-named.merge.out	Mon Mar 09 21:37:47 2009 -0700
+++ b/en/examples/results/branch-named.merge.out	Mon Mar 09 21:39:23 2009 -0700
@@ -1,16 +1,17 @@
-$ \textbf{hg branch}
+<screen><prompt>$</prompt> <userinput>hg branch</userinput>
 bar
-$ \textbf{hg merge foo}
+<prompt>$</prompt> <userinput>hg merge foo</userinput>
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
-$ \textbf{hg commit -m 'Merge'}
-$ \textbf{hg tip}
+<prompt>$</prompt> <userinput>hg commit -m 'Merge'</userinput>
+<prompt>$</prompt> <userinput>hg tip</userinput>
 changeset:   
 branch:      bar
 tag:         tip
 parent:      
 parent:      
-user:        Bryan O'Sullivan <bos@serpentine.com>
+user:        Bryan O'Sullivan &lt;bos@serpentine.com&gt;
 
 summary:     Merge
 
+</screen>