diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-06-13 12:47:08 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-06-13 12:47:08 -0700 |
| commit | 1bbc820414d94452d1417bb83db86309f34720a3 (patch) | |
| tree | 2eb3a4843174f6999a290da3e5b7c5b55173701a /Documentation | |
| parent | b8364903c3e4cde713102e4a36d3926b020b0f70 (diff) | |
| parent | b6f0621a462e4ff11999c8e2d8279c0ffd3be201 (diff) | |
| download | git-1bbc820414d94452d1417bb83db86309f34720a3.tar.gz git-1bbc820414d94452d1417bb83db86309f34720a3.tar.xz | |
Merge branch 'da/araxis-mergetool'
* da/araxis-mergetool:
mergetool--lib: add support for araxis merge
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-difftool.txt | 2 | ||||
| -rw-r--r-- | Documentation/git-mergetool.txt | 2 | ||||
| -rw-r--r-- | Documentation/merge-config.txt | 2 |
3 files changed, 3 insertions, 3 deletions
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 <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 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 diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt index 4832bc75e..c0f96e707 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. |