X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-mergetool.txt;h=68ed6c095664b8f06635ba7eaa85b85086b24280;hb=7d40f89137b456820d51ebc1cbb3ffbb966e7fec;hp=ff9700d17a333f50d6509bc14a0bd81fad876d3b;hpb=1ee28e58d576bf15c1efce4b9a92df9b893b3bc0;p=git.git

diff --git a/Documentation/git-mergetool.txt b/Documentation/git-mergetool.txt
index ff9700d17..68ed6c095 100644
--- a/Documentation/git-mergetool.txt
+++ b/Documentation/git-mergetool.txt
@@ -27,7 +27,7 @@ OPTIONS
 	Use the merge resolution program specified by <tool>.
 	Valid merge tools are:
 	kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, ecmerge,
-	diffuse, tortoisemerge and opendiff
+	diffuse, tortoisemerge, opendiff and araxis.
 +
 If a merge resolution program is not specified, 'git-mergetool'
 will use the configuration variable `merge.tool`.  If the