diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2007-03-30 08:52:26 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2007-03-30 08:52:26 +0000 |
| commit | 3aa81825100a7380b2dec081876323507b150a95 (patch) | |
| tree | 8bc052b9ca43f34e85e11f64d9236dc767c2e532 /git-mergetool.html | |
| parent | 2fc92604e7f1634018085145b1861d1105dff5e5 (diff) | |
| download | git-htmldocs-3aa81825100a7380b2dec081876323507b150a95.tar.gz | |
Autogenerated HTML docs for v1.5.1-rc3-20-gaa453
Diffstat (limited to 'git-mergetool.html')
| -rw-r--r-- | git-mergetool.html | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/git-mergetool.html b/git-mergetool.html index 32065ec25..847458077 100644 --- a/git-mergetool.html +++ b/git-mergetool.html @@ -295,13 +295,10 @@ with merge conflicts.</p> Valid merge tools are:
kdiff3, tkdiff, meld, xxdiff, emerge, and vimdiff.
</p>
-<div class="literalblock">
-<div class="content">
-<pre><tt>If a merge resolution program is not specified, 'git mergetool'
+<p>If a merge resolution program is not specified, <em>git mergetool</em>
will use the configuration variable merge.tool. If the
-configuration variable merge.tool is not set, 'git mergetool'
-will pick a suitable default.</tt></pre>
-</div></div>
+configuration variable merge.tool is not set, <em>git mergetool</em>
+will pick a suitable default.</p>
</dd>
</dl>
</div>
@@ -319,7 +316,7 @@ will pick a suitable default.</tt></pre> </div>
<div id="footer">
<div id="footer-text">
-Last updated 19-Mar-2007 10:43:14 UTC
+Last updated 30-Mar-2007 08:52:09 UTC
</div>
</div>
</body>
|