Autogenerated HTML docs for v1.6.6.1-383-g5a9f

1 files changed, 9 insertions, 9 deletions

diff --git a/git-mergetool.html b/git-mergetool.html
index 9ce12d00c..66192168f 100644
--- a/git-mergetool.html
+++ b/git-mergetool.html
@@ -325,10 +325,10 @@ git-mergetool(1) Manual Page
 <h2 id="_description">DESCRIPTION</h2>

 <div class="sectionbody">

 <div class="para"><p>Use <tt>git mergetool</tt> to run one of several merge utilities to resolve

-merge conflicts.  It is typically run after <em>git-merge</em>.</p></div>

+merge conflicts.  It is typically run after <em>git merge</em>.</p></div>

 <div class="para"><p>If one or more &lt;file&gt; parameters are given, the merge tool program will

 be run to resolve differences on each file.  If no &lt;file&gt; names are

-specified, <em>git-mergetool</em> will run the merge tool program on every file

+specified, <em>git mergetool</em> will run the merge tool program on every file

 with merge conflicts.</p></div>

 </div>

 <h2 id="_options">OPTIONS</h2>

@@ -347,20 +347,20 @@ with merge conflicts.</p></div>
         kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, ecmerge,

         diffuse, tortoisemerge, opendiff, p4merge and araxis.

 </p>

-<div class="para"><p>If a merge resolution program is not specified, <em>git-mergetool</em>

+<div class="para"><p>If a merge resolution program is not specified, <em>git mergetool</em>

 will use the configuration variable <tt>merge.tool</tt>.  If the

-configuration variable <tt>merge.tool</tt> is not set, <em>git-mergetool</em>

+configuration variable <tt>merge.tool</tt> is not set, <em>git mergetool</em>

 will pick a suitable default.</p></div>

 <div class="para"><p>You can explicitly provide a full path to the tool by setting the

 configuration variable <tt>mergetool.&lt;tool&gt;.path</tt>. For example, you

 can configure the absolute path to kdiff3 by setting

-<tt>mergetool.kdiff3.path</tt>. Otherwise, <em>git-mergetool</em> assumes the

+<tt>mergetool.kdiff3.path</tt>. Otherwise, <em>git mergetool</em> assumes the

 tool is available in PATH.</p></div>

 <div class="para"><p>Instead of running one of the known merge tool programs,

-<em>git-mergetool</em> can be customized to run an alternative program

+<em>git mergetool</em> can be customized to run an alternative program

 by specifying the command line to invoke in a configuration

 variable <tt>mergetool.&lt;tool&gt;.cmd</tt>.</p></div>

-<div class="para"><p>When <em>git-mergetool</em> is invoked with this tool (either through the

+<div class="para"><p>When <em>git mergetool</em> is invoked with this tool (either through the

 <tt>-t</tt> or <tt>--tool</tt> option or the <tt>merge.tool</tt> configuration

 variable) the configured command line will be invoked with <tt>$BASE</tt>

 set to the name of a temporary file containing the common base for

@@ -373,7 +373,7 @@ merge resolution.</p></div>
 <div class="para"><p>If the custom merge tool correctly indicates the success of a

 merge resolution with its exit code, then the configuration

 variable <tt>mergetool.&lt;tool&gt;.trustExitCode</tt> can be set to <tt>true</tt>.

-Otherwise, <em>git-mergetool</em> will prompt the user to indicate the

+Otherwise, <em>git mergetool</em> will prompt the user to indicate the

 success of the resolution after the custom tool has exited.</p></div>

 </dd>

 <dt>

@@ -414,7 +414,7 @@ success of the resolution after the custom tool has exited.</p></div>
 </div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2009-12-03 09:12:41 UTC

+Last updated 2010-01-21 17:44:33 UTC

 </div>

 </div>

 </body>