diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2008-08-06 06:19:33 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2008-08-06 06:19:33 +0000 |
| commit | cb1c44f98ce06a76975f2d1fcb62a33188cefafb (patch) | |
| tree | 1931b049d41a1748f1634ff6eadf3b9c5b5fc03f /git-mergetool.html | |
| parent | af1987f2cf92a51722ff34f920cccecb056f8364 (diff) | |
| download | git-htmldocs-cb1c44f98ce06a76975f2d1fcb62a33188cefafb.tar.gz | |
Autogenerated HTML docs for v1.6.0-rc1-90-gddd6
Diffstat (limited to 'git-mergetool.html')
| -rw-r--r-- | git-mergetool.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-mergetool.html b/git-mergetool.html index 0c7b646eb..301e50bb8 100644 --- a/git-mergetool.html +++ b/git-mergetool.html @@ -354,7 +354,7 @@ can configure the absolute path to kdiff3 by setting 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
-by specifying the command line to invoke in a configration
+by specifying the command line to invoke in a configuration
variable <tt>mergetool.<tool>.cmd</tt>.</p></div>
<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
@@ -388,7 +388,7 @@ success of the resolution after the custom tool has exited.</p></div> </div>
<div id="footer">
<div id="footer-text">
-Last updated 2008-07-06 05:16:54 UTC
+Last updated 2008-08-06 06:19:09 UTC
</div>
</div>
</body>
|