summaryrefslogtreecommitdiff
path: root/Documentation/merge-config.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-06-13 19:47:08 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-06-13 19:47:08 (GMT)
commit1bbc820414d94452d1417bb83db86309f34720a3 (patch)
tree2eb3a4843174f6999a290da3e5b7c5b55173701a /Documentation/merge-config.txt
parentb8364903c3e4cde713102e4a36d3926b020b0f70 (diff)
parentb6f0621a462e4ff11999c8e2d8279c0ffd3be201 (diff)
downloadgit-1bbc820414d94452d1417bb83db86309f34720a3.zip
git-1bbc820414d94452d1417bb83db86309f34720a3.tar.gz
git-1bbc820414d94452d1417bb83db86309f34720a3.tar.bz2
Merge branch 'da/araxis-mergetool'
* da/araxis-mergetool: mergetool--lib: add support for araxis merge
Diffstat (limited to 'Documentation/merge-config.txt')
-rw-r--r--Documentation/merge-config.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt
index 4832bc7..c0f96e7 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.