diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2009-06-14 01:03:22 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2009-06-14 01:03:22 +0000 |
| commit | 25e7ba6dc84805e96d73967f3182ffcb54d4022f (patch) | |
| tree | 87bd8083933f1666e158fa3b9137783d21c8e3da /git-mergetool.txt | |
| parent | b95b43d92df1ebc0d5235b3e84ba4136052b09a2 (diff) | |
| download | git-htmldocs-25e7ba6dc84805e96d73967f3182ffcb54d4022f.tar.gz | |
Autogenerated HTML docs for v1.6.3.2-306-g4f4fa
Diffstat (limited to 'git-mergetool.txt')
| -rw-r--r-- | git-mergetool.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-mergetool.txt b/git-mergetool.txt index ff9700d17..68ed6c095 100644 --- a/git-mergetool.txt +++ b/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 |