X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=Documentation%2Fmerge-config.txt;h=c0f96e70708cab74a13ec8696db003289f99b455;hb=130b04ab37d74e574d525df7948b963b13c6bdbf;hp=4832bc75e2604c997e004018023e3b93cb394b87;hpb=456cb4cf3ef6e3dec637b7061b0c834b62eba0f5;p=git.git

diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt
index 4832bc75e..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",
-	"diffuse", "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.