Autogenerated HTML docs for v1.6.1-rc2-14-g5363d

1 files changed, 4 insertions, 4 deletions

diff --git a/git-merge-index.html b/git-merge-index.html
index 4c82b3a1d..a3ae881e9 100644
--- a/git-merge-index.html
+++ b/git-merge-index.html
@@ -356,7 +356,7 @@ files are passed as arguments 5, 6 and 7.</p></div>
         Instead of stopping at the first failed merge, do all of them

         in one shot - continue with merging even when previous merges

         returned errors, and only return the error code after all the

-        merges are over.

+        merges.

 </p>

 </dd>

 <dt>

@@ -364,8 +364,8 @@ files are passed as arguments 5, 6 and 7.</p></div>
 </dt>

 <dd>

 <p>

-        Do not complain about failed merge program (the merge program

-        failure usually indicates conflicts during merge). This is for

+        Do not complain about a failed merge program (a merge program

+        failure usually indicates conflicts during the merge). This is for

         porcelains which might want to emit custom messages.

 </p>

 </dd>

@@ -420,7 +420,7 @@ One-shot merge by Petr Baudis &lt;pasky@ucw.cz&gt;</p></div>
 </div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2008-10-31 11:28:41 UTC

+Last updated 2008-12-10 08:33:20 UTC

 </div>

 </div>

 </body>