Autogenerated HTML docs for v1.7.4.1-294-gaf4c

1 files changed, 6 insertions, 6 deletions

diff --git a/gitattributes.html b/gitattributes.html
index 64b76c8ba..173d7da86 100644
--- a/gitattributes.html
+++ b/gitattributes.html
@@ -1063,7 +1063,7 @@ The solution is to use the <tt>diff.*.binary</tt> config option:</p></div>
 </div></div>

 <h3 id="_performing_a_three_way_merge">Performing a three-way merge</h3><div style="clear:left"></div>

 <h4 id="_tt_merge_tt"><tt>merge</tt></h4>

-<div class="paragraph"><p>The attribute <tt>merge</tt> affects how three versions of a file is

+<div class="paragraph"><p>The attribute <tt>merge</tt> affects how three versions of a file are

 merged when a file-level merge is necessary during <tt>git merge</tt>,

 and other commands such as <tt>git revert</tt> and <tt>git cherry-pick</tt>.</p></div>

 <div class="dlist"><dl>

@@ -1084,7 +1084,7 @@ Unset
 <p>

         Take the version from the current branch as the

         tentative merge result, and declare that the merge has

-        conflicts.  This is suitable for binary files that does

+        conflicts.  This is suitable for binary files that do

         not have a well-defined merge semantics.

 </p>

 </dd>

@@ -1094,9 +1094,9 @@ Unspecified
 <dd>

 <p>

         By default, this uses the same built-in 3-way merge

-        driver as is the case the <tt>merge</tt> attribute is set.

-        However, <tt>merge.default</tt> configuration variable can name

-        different merge driver to be used for paths to which the

+        driver as is the case when the <tt>merge</tt> attribute is set.

+        However, the <tt>merge.default</tt> configuration variable can name

+        different merge driver to be used with paths for which the

         <tt>merge</tt> attribute is unspecified.

 </p>

 </dd>

@@ -1362,7 +1362,7 @@ frotz   unspecified</tt></pre>
 </div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2011-01-14 00:43:06 UTC

+Last updated 2011-03-19 01:35:18 UTC

 </div>

 </div>

 </body>