1.1 --- a/en/ch03-tour-merge.xml	Mon Mar 09 23:37:29 2009 -0700
     1.2 +++ b/en/ch03-tour-merge.xml	Tue Mar 17 21:47:12 2009 -0700
     1.3 @@ -337,9 +337,9 @@
     1.4      <para>The process of merging changes as outlined above is
     1.5        straightforward, but requires running three commands in
     1.6        sequence.</para>
     1.7 -    <programlisting>
     1.8 -      hg pull hg merge hg commit -m 'Merged remote changes'
     1.9 -    </programlisting>
    1.10 +    <programlisting>hg pull
    1.11 +hg merge
    1.12 +hg commit -m 'Merged remote changes'</programlisting>
    1.13      <para>In the case of the final commit, you also need to enter a
    1.14        commit message, which is almost always going to be a piece of
    1.15        uninteresting <quote>boilerplate</quote> text.</para>
    1.16 @@ -376,9 +376,8 @@
    1.17        <literal role="rc-extensions">extensions</literal> section. Then
    1.18        add a line that simply reads <quote><literal>fetch
    1.19  	</literal></quote>.</para>
    1.20 -    <programlisting>
    1.21 -      [extensions] fetch =
    1.22 -    </programlisting>
    1.23 +    <programlisting>[extensions]
    1.24 +fetch =</programlisting>
    1.25      <para>(Normally, on the right-hand side of the
    1.26        <quote><literal>=</literal></quote> would appear the location of
    1.27        the extension, but since the <literal