Autogenerated HTML docs for v1.8.1.2-545-g2f19ad

1 files changed, 3 insertions, 3 deletions

diff --git a/git-merge-index.html b/git-merge-index.html
index 5771a6f2a..f7ac301c0 100644
--- a/git-merge-index.html
+++ b/git-merge-index.html
@@ -805,11 +805,11 @@ files are passed as arguments 5, 6 and 7.</p></div>
 <div class="paragraph"><p>If <em>git merge-index</em> is called with multiple &lt;file&gt;s (or -a) then it

 processes them in turn only stopping if merge returns a non-zero exit

 code.</p></div>

-<div class="paragraph"><p>Typically this is run with a script calling git&#8217;s imitation of

+<div class="paragraph"><p>Typically this is run with a script calling Git&#8217;s imitation of

 the <em>merge</em> command from the RCS package.</p></div>

 <div class="paragraph"><p>A sample script called <em>git merge-one-file</em> is included in the

 distribution.</p></div>

-<div class="paragraph"><p>ALERT ALERT ALERT! The git "merge object order" is different from the

+<div class="paragraph"><p>ALERT ALERT ALERT! The Git "merge object order" is different from the

 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>

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

 <div id="footer">

 <div id="footer-text">

-Last updated 2011-11-15 13:45:02 PST

+Last updated 2013-02-05 21:07:26 PST

 </div>

 </div>

 </body>