Autogenerated HTML docs for v1.7.0.2-323-g0d09

1 files changed, 10 insertions, 6 deletions

diff --git a/git-merge-file.html b/git-merge-file.html
index 849175800..8f64a253d 100644
--- a/git-merge-file.html
+++ b/git-merge-file.html
@@ -322,7 +322,7 @@ git-merge-file(1) Manual Page
 <div class="sectionbody">

 <div class="verseblock">

 <div class="content"><em>git merge-file</em> [-L &lt;current-name&gt; [-L &lt;base-name&gt; [-L &lt;other-name&gt;]]]

-        [--ours|--theirs] [-p|--stdout] [-q|--quiet]

+        [--ours|--theirs|--union] [-p|--stdout] [-q|--quiet] [--marker-size=&lt;n&gt;]

         &lt;current-file&gt; &lt;base-file&gt; &lt;other-file&gt;</div></div>

 </div>

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

@@ -346,9 +346,10 @@ lines in file B
 &gt;&gt;&gt;&gt;&gt;&gt;&gt; B</tt></pre>

 </div></div>

 <div class="para"><p>If there are conflicts, the user should edit the result and delete one of

-the alternatives.  When <tt>--ours</tt> or <tt>--theirs</tt> option is in effect, however,

-these conflicts are resolved favouring lines from <tt>&lt;current-file&gt;</tt> or

-lines from <tt>&lt;other-file&gt;</tt> respectively.</p></div>

+the alternatives.  When <tt>--ours</tt>, <tt>--theirs</tt>, or <tt>--union</tt> option is in effect,

+however, these conflicts are resolved favouring lines from <tt>&lt;current-file&gt;</tt>,

+lines from <tt>&lt;other-file&gt;</tt>, or lines from both respectively.  The length of the

+conflict markers can be given with the <tt>--marker-size</tt> option.</p></div>

 <div class="para"><p>The exit value of this program is negative on error, and the number of

 conflicts otherwise. If the merge was clean, the exit value is 0.</p></div>

 <div class="para"><p><em>git merge-file</em> is designed to be a minimal clone of RCS <em>merge</em>; that is, it

@@ -394,10 +395,13 @@ implements all of RCS <em>merge</em>'s functionality which is needed by
 <dt>

 --theirs

 </dt>

+<dt>

+--union

+</dt>

 <dd>

 <p>

         Instead of leaving conflicts in the file, resolve conflicts

-        favouring our (or their) side of the lines.

+        favouring our (or their or both) side of the lines.

 </p>

 </dd>

 </dl></div>

@@ -440,7 +444,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 2010-02-13 00:59:48 UTC

+Last updated 2010-03-20 20:59:12 UTC

 </div>

 </div>

 </body>