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

1 files changed, 7 insertions, 7 deletions

diff --git a/git-merge-file.html b/git-merge-file.html
index 9065e4e06..51b7e00c4 100644
--- a/git-merge-file.html
+++ b/git-merge-file.html
@@ -326,16 +326,16 @@ git-merge-file(1) Manual Page
 </div>

 <h2 id="_description">DESCRIPTION</h2>

 <div class="sectionbody">

-<div class="para"><p><em>git-file-merge</em> incorporates all changes that lead from the <tt>&lt;base-file&gt;</tt>

+<div class="para"><p><em>git-merge-file</em> incorporates all changes that lead from the <tt>&lt;base-file&gt;</tt>

 to <tt>&lt;other-file&gt;</tt> into <tt>&lt;current-file&gt;</tt>. The result ordinarily goes into

 <tt>&lt;current-file&gt;</tt>. <em>git-merge-file</em> is useful for combining separate changes

 to an original. Suppose <tt>&lt;base-file&gt;</tt> is the original, and both

-<tt>&lt;current-file&gt;</tt> and <tt>&lt;other-file&gt;</tt> are modifications of <tt>&lt;base-file&gt;</tt>.

-Then <em>git-merge-file</em> combines both changes.</p></div>

+<tt>&lt;current-file&gt;</tt> and <tt>&lt;other-file&gt;</tt> are modifications of <tt>&lt;base-file&gt;</tt>,

+then <em>git-merge-file</em> combines both changes.</p></div>

 <div class="para"><p>A conflict occurs if both <tt>&lt;current-file&gt;</tt> and <tt>&lt;other-file&gt;</tt> have changes

 in a common segment of lines. If a conflict is found, <em>git-merge-file</em>

-normally outputs a warning and brackets the conflict with &lt;&lt;&lt;&lt;&lt;&lt;&lt; and

-&gt;&gt;&gt;&gt;&gt;&gt;&gt; lines. A typical conflict will look like this:</p></div>

+normally outputs a warning and brackets the conflict with lines containing

+&lt;&lt;&lt;&lt;&lt;&lt;&lt; and &gt;&gt;&gt;&gt;&gt;&gt;&gt; markers. A typical conflict will look like this:</p></div>

 <div class="literalblock">

 <div class="content">

 <pre><tt>&lt;&lt;&lt;&lt;&lt;&lt;&lt; A

@@ -382,7 +382,7 @@ implements all of RCS <em>merge</em>'s functionality which is needed by
 </dt>

 <dd>

 <p>

-        Quiet;  do  not  warn about conflicts.

+        Quiet; do not warn about conflicts.

 </p>

 </dd>

 </dl></div>

@@ -425,7 +425,7 @@ with parts copied from the original documentation of RCS <em>merge</em>.</p></di
 </div>

 <div id="footer">

 <div id="footer-text">

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

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

 </div>

 </div>

 </body>