X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-difftool.txt;h=96a6c51a4b83207fa23fc8f09cb02f57b1085ea4;hb=7d40f89137b456820d51ebc1cbb3ffbb966e7fec;hp=15b247bab4195286e55447388308473af4e2d001;hpb=4f760b74cfaa23222901739cdc62951cc7b8c5b6;p=git.git diff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt index 15b247bab..96a6c51a4 100644 --- a/Documentation/git-difftool.txt +++ b/Documentation/git-difftool.txt @@ -31,7 +31,7 @@ OPTIONS Use the diff tool specified by . Valid merge tools are: kdiff3, kompare, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, - ecmerge, diffuse and opendiff + ecmerge, diffuse, opendiff and araxis. + If a diff tool is not specified, 'git-difftool' will use the configuration variable `diff.tool`. If the