X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fmerge-config.txt;h=c0f96e70708cab74a13ec8696db003289f99b455;hb=974e6e42f7a66b69bd684af4f637ab064acfdf92;hp=8c10f66702022b460a7c3ada8daa83f51b1f1e90;hpb=b98c212a9fd97300a8cf39015b8d693f319fd71c;p=git.git

diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt
index 8c10f6670..c0f96e707 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",
-	"ecmerge", tortoisemerge and
+	"diffuse", "ecmerge", "tortoisemerge", "araxis", and
 	"opendiff".  Any other value is treated is custom merge tool
 	and there must be a corresponding mergetool.<tool>.cmd option.