Autogenerated HTML docs for v1.6.2.1-389-geed1

1 files changed, 9 insertions, 9 deletions

diff --git a/git-merge.html b/git-merge.html
index 85d772bcf..47591f1b9 100644
--- a/git-merge.html
+++ b/git-merge.html
@@ -516,7 +516,7 @@ resolve
 <dd>

 <p>

         This can only resolve two heads (i.e. the current branch

-        and another branch you pulled from) using 3-way merge

+        and another branch you pulled from) using a 3-way merge

         algorithm.  It tries to carefully detect criss-cross

         merge ambiguities and is considered generally safe and

         fast.

@@ -527,9 +527,9 @@ recursive
 </dt>

 <dd>

 <p>

-        This can only resolve two heads using 3-way merge

-        algorithm.  When there are more than one common

-        ancestors that can be used for 3-way merge, it creates a

+        This can only resolve two heads using a 3-way merge

+        algorithm.  When there is more than one common

+        ancestor that can be used for 3-way merge, it creates a

         merged tree of the common ancestors and uses that as

         the reference tree for the 3-way merge.  This has been

         reported to result in fewer merge conflicts without

@@ -545,11 +545,11 @@ octopus
 </dt>

 <dd>

 <p>

-        This resolves more than two-head case, but refuses to do

-        complex merge that needs manual resolution.  It is

+        This resolves cases with more than two heads, but refuses to do

+        a complex merge that needs manual resolution.  It is

         primarily meant to be used for bundling topic branch

         heads together.  This is the default merge strategy when

-        pulling or merging more than one branches.

+        pulling or merging more than one branch.

 </p>

 </dd>

 <dt>

@@ -577,7 +577,7 @@ subtree
 </dd>

 </dl></div>

 <div class="para"><p>If you tried a merge which resulted in a complex conflicts and

-would want to start over, you can recover with <em>git-reset</em>.</p></div>

+want to start over, you can recover with <em>git-reset</em>.</p></div>

 </div>

 <h2 id="_configuration">CONFIGURATION</h2>

 <div class="sectionbody">

@@ -920,7 +920,7 @@ Look at the originals.  <em>git show :1:filename</em> shows the
 </div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2009-03-18 01:54:21 UTC

+Last updated 2009-03-26 08:39:13 UTC

 </div>

 </div>

 </body>