Autogenerated HTML docs for v1.5.4-rc3-24-gb53139

1 files changed, 7 insertions, 7 deletions

diff --git a/git-merge.html b/git-merge.html
index 2f72cda7a..cda152801 100644
--- a/git-merge.html
+++ b/git-merge.html
@@ -510,14 +510,14 @@ report no changes.</p>
 <td class="icon">

 <div class="title">Note</div>

 </td>

-<td class="content">This is a bit of lie.  In certain special cases, your index are

-allowed to be different from the tree of <tt>HEAD</tt> commit.  The most

+<td class="content">This is a bit of a lie.  In certain special cases, your index is

+allowed to be different from the tree of the <tt>HEAD</tt> commit.  The most

 notable case is when your <tt>HEAD</tt> commit is already ahead of what

 is being merged, in which case your index can have arbitrary

-difference from your <tt>HEAD</tt> commit.  Otherwise, your index entries

-are allowed have differences from your <tt>HEAD</tt> commit that match

-the result of trivial merge (e.g. you received the same patch

-from external source to produce the same result as what you are

+differences from your <tt>HEAD</tt> commit.  Also, your index entries

+may have differences from your <tt>HEAD</tt> commit that match

+the result of a trivial merge (e.g. you received the same patch

+from an external source to produce the same result as what you are

 merging).  For example, if a path did not exist in the common

 ancestor and your head commit but exists in the tree you are

 merging into your repository, and if you already happen to have

@@ -649,7 +649,7 @@ Resolve the conflicts.  <tt>git-diff</tt> would report only the
 </div>

 <div id="footer">

 <div id="footer-text">

-Last updated 07-Jan-2008 07:50:33 UTC

+Last updated 17-Jan-2008 02:42:45 UTC

 </div>

 </div>

 </body>