X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-difftool.txt;h=8e9aed67d7f68c0234ee47dc147736bf3b8e5c4f;hb=0196f4b5a325251f62192f164cd1061a3fd98be8;hp=96a6c51a4b83207fa23fc8f09cb02f57b1085ea4;hpb=ef3a4fd670a4874f9b598ef96b10b89117b806e1;p=git.git

diff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt
index 96a6c51a4..8e9aed67d 100644
--- a/Documentation/git-difftool.txt
+++ b/Documentation/git-difftool.txt
@@ -31,7 +31,7 @@ OPTIONS
 	Use the diff tool specified by <tool>.
 	Valid merge tools are:
 	kdiff3, kompare, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff,
-	ecmerge, diffuse, opendiff and araxis.
+	ecmerge, diffuse, opendiff, p4merge and araxis.
 +
 If a diff tool is not specified, 'git-difftool'
 will use the configuration variable `diff.tool`.  If the