X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fmerge-config.txt;h=4832bc75e2604c997e004018023e3b93cb394b87;hb=b79376cdf3bd6ee922261776613d085a7b36ffd9;hp=1ff08ff2ccc6e56542f49713867698b66dab673f;hpb=f474c526618d5d1111b585a6344e012fb731d3fe;p=git.git

diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt
index 1ff08ff2c..4832bc75e 100644
--- a/Documentation/merge-config.txt
+++ b/Documentation/merge-config.txt
@@ -22,7 +22,8 @@ merge.stat::
 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", and
+	"tkdiff", "meld", "xxdiff", "emerge", "vimdiff", "gvimdiff",
+	"diffuse", "ecmerge", "tortoisemerge", and
 	"opendiff".  Any other value is treated is custom merge tool
 	and there must be a corresponding mergetool.<tool>.cmd option.