hgbook

diff en/examples/results/tour.merge.update.out @ 591:b788b405e141

find changesets by author, revision, files, or words in the commit message
Replace uses of <informalfigure> with <figure>
author Bryan O'Sullivan <bos@serpentine.com>
date Thu Mar 26 21:07:39 2009 -0700 (2009-03-26)
parents 44d1363234d2
children 4432ad34b8e5
line diff
     1.1 --- a/en/examples/results/tour.merge.update.out	Mon Mar 09 21:37:47 2009 -0700
     1.2 +++ b/en/examples/results/tour.merge.update.out	Thu Mar 26 21:07:39 2009 -0700
     1.3 @@ -1,2 +1,3 @@
     1.4 -$ \textbf{hg update}
     1.5 +<screen><prompt>$</prompt> <userinput>hg update</userinput>
     1.6  abort: crosses branches (use 'hg merge' or 'hg update -C')
     1.7 +</screen>