diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-06-13 19:47:08 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-06-13 19:47:08 (GMT) |
| commit | 1bbc820414d94452d1417bb83db86309f34720a3 (patch) | |
| tree | 2eb3a4843174f6999a290da3e5b7c5b55173701a /Documentation/git-mergetool.txt | |
| parent | b8364903c3e4cde713102e4a36d3926b020b0f70 (diff) | |
| parent | b6f0621a462e4ff11999c8e2d8279c0ffd3be201 (diff) | |
| download | git-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/git-mergetool.txt')
| -rw-r--r-- | Documentation/git-mergetool.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-mergetool.txt b/Documentation/git-mergetool.txt index ff9700d..68ed6c0 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 |