Autogenerated HTML docs for v2.23.0-526-g70bf0

1 files changed, 7 insertions, 7 deletions

diff --git a/git-merge-index.html b/git-merge-index.html
index 1e21dc64f..97c451dd6 100644
--- a/git-merge-index.html
+++ b/git-merge-index.html
@@ -817,16 +817,16 @@ RCS <em>merge</em> program merge object order. In the above ordering, the
 original is first. But the argument order to the 3-way merge program

 <em>merge</em> is to have the original in the middle. Don&#8217;t ask me why.</p></div>

 <div class="paragraph"><p>Examples:</p></div>

-<div class="literalblock">

+<div class="listingblock">

 <div class="content">

 <pre><code>torvalds@ppc970:~/merge-test&gt; git merge-index cat MM

-This is MM from the original tree.                    # original

-This is modified MM in the branch A.                  # merge1

-This is modified MM in the branch B.                  # merge2

-This is modified MM in the branch B.                  # current contents</code></pre>

+This is MM from the original tree.              # original

+This is modified MM in the branch A.            # merge1

+This is modified MM in the branch B.            # merge2

+This is modified MM in the branch B.            # current contents</code></pre>

 </div></div>

 <div class="paragraph"><p>or</p></div>

-<div class="literalblock">

+<div class="listingblock">

 <div class="content">

 <pre><code>torvalds@ppc970:~/merge-test&gt; git merge-index cat AA MM

 cat: : No such file or directory

@@ -852,7 +852,7 @@ for the AA file, because it didn&#8217;t exist in the original, and thus
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2018-01-27 08:11:04 JST

+ 2019-10-09 14:51:03 JST

 </div>

 </div>

 </body>