summaryrefslogtreecommitdiff
path: root/Documentation/git-difftool.txt
diff options
context:
space:
mode:
authorDavid Aguilar <davvid@gmail.com>2009-05-24 00:24:41 +0000
committerJunio C Hamano <gitster@pobox.com>2009-05-24 11:21:05 -0700
commitb6f0621a462e4ff11999c8e2d8279c0ffd3be201 (patch)
treec054ccc5f9f12c8db69de036c9d868a458ca2d48 /Documentation/git-difftool.txt
parent4481ff048df4c86021d783de6f099909495f04ff (diff)
downloadgit-b6f0621a462e4ff11999c8e2d8279c0ffd3be201.tar.gz
mergetool--lib: add support for araxis merge
Araxis merge is now a built-in diff/merge tool. This adds araxis to git-completion and updates the documentation to mention araxis. Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-difftool.txt')
-rw-r--r--Documentation/git-difftool.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt
index 15b247bab4..96a6c51a4b 100644
--- a/Documentation/git-difftool.txt
+++ b/Documentation/git-difftool.txt
@@ -31,7 +31,7 @@ OPTIONS
Use the diff tool specified by <tool>.
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