X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fmerge-config.txt;h=a403155052299dd0aaafd6bdfe0fec92d0d0ac7c;hb=0cdca133ec8aa10fe4c806f6695ccbf32394aa91;hp=c0f96e70708cab74a13ec8696db003289f99b455;hpb=ef3a4fd670a4874f9b598ef96b10b89117b806e1;p=git.git

diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt
index c0f96e707..a40315505 100644
--- a/Documentation/merge-config.txt
+++ b/Documentation/merge-config.txt
@@ -23,7 +23,7 @@ merge.tool::
 	Controls which merge resolution program is used by
 	linkgit:git-mergetool[1].  Valid built-in values are: "kdiff3",
 	"tkdiff", "meld", "xxdiff", "emerge", "vimdiff", "gvimdiff",
-	"diffuse", "ecmerge", "tortoisemerge", "araxis", and
+	"diffuse", "ecmerge", "tortoisemerge", "p4merge", "araxis" and
 	"opendiff".  Any other value is treated is custom merge tool
 	and there must be a corresponding mergetool.<tool>.cmd option.