diff options
| author | David Aguilar <davvid@gmail.com> | 2009-05-24 00:24:41 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-05-24 18:21:05 (GMT) |
| commit | b6f0621a462e4ff11999c8e2d8279c0ffd3be201 (patch) | |
| tree | c054ccc5f9f12c8db69de036c9d868a458ca2d48 /Documentation/git-difftool.txt | |
| parent | 4481ff048df4c86021d783de6f099909495f04ff (diff) | |
| download | git-b6f0621a462e4ff11999c8e2d8279c0ffd3be201.zip git-b6f0621a462e4ff11999c8e2d8279c0ffd3be201.tar.gz git-b6f0621a462e4ff11999c8e2d8279c0ffd3be201.tar.bz2 | |
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.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt index 15b247b..96a6c51 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 |