diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2009-11-16 02:10:54 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2009-11-16 02:10:54 +0000 |
| commit | 3f680f3f3b57189c755ddb5f3c7f099ddab1b221 (patch) | |
| tree | 2a5e1f1d44ea53e5d9fa7ebcf56d558feac065c7 /git-mergetool.html | |
| parent | e1b2683fe5d6d67aa52277a7a90966c3cec6ef93 (diff) | |
| download | git-htmldocs-3f680f3f3b57189c755ddb5f3c7f099ddab1b221.tar.gz | |
Autogenerated HTML docs for v1.6.5.2-215-g77097f
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 63eaadb2c..bcd95ac19 100644 --- a/git-mergetool.html +++ b/git-mergetool.html @@ -345,7 +345,7 @@ with merge conflicts.</p></div> Use the merge resolution program specified by <tool>.
Valid merge tools are:
kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, ecmerge,
- diffuse, tortoisemerge, opendiff and araxis.
+ diffuse, tortoisemerge, opendiff, p4merge and araxis.
</p>
<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
@@ -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-11-15 09:57:12 UTC
+Last updated 2009-11-16 02:10:12 UTC
</div>
</div>
</body>
|