diff options
| author | David Aguilar <davvid@gmail.com> | 2009-05-24 00:24:41 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-05-24 11:21:05 -0700 |
| commit | b6f0621a462e4ff11999c8e2d8279c0ffd3be201 (patch) | |
| tree | c054ccc5f9f12c8db69de036c9d868a458ca2d48 /Documentation/merge-config.txt | |
| parent | 4481ff048df4c86021d783de6f099909495f04ff (diff) | |
| download | git-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/merge-config.txt')
| -rw-r--r-- | Documentation/merge-config.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt index 4832bc75e2..c0f96e7070 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. |