Merge branch 'maint-1.6.5' into maint

[git.git] / Documentation / git-mergetool.txt

diff --git a/Documentation/git-mergetool.txt b/Documentation/git-mergetool.txt
index ff9700d17a333f50d6509bc14a0bd81fad876d3b..4a6f7f3a2d189c40e4abfe4f74178f79d1c563fd 100644 (file)
--- a/Documentation/git-mergetool.txt
+++ b/Documentation/git-mergetool.txt
@@ -27,7 +27,7 @@ OPTIONS
        Use the merge resolution program specified by <tool>.
        Valid merge tools are:
        kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, ecmerge,
-       diffuse, tortoisemerge and opendiff
+       diffuse, tortoisemerge, opendiff, p4merge and araxis.
 +
 If a merge resolution program is not specified, 'git-mergetool'
 will use the configuration variable `merge.tool`.  If the