diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2009-04-18 06:17:56 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2009-04-18 06:17:56 +0000 |
| commit | 3bd66e9adf9669a8ba7bf8f191a111ae0cf41e51 (patch) | |
| tree | b0bda7514cbe49768ca02dee664f52a85399c2dd /git-mergetool.txt | |
| parent | 98e32c30fcbbbed199fa402656feffe7f4843784 (diff) | |
| download | git-htmldocs-3bd66e9adf9669a8ba7bf8f191a111ae0cf41e51.tar.gz | |
Autogenerated HTML docs for v1.6.3-rc0-53-g1a1f0
Diffstat (limited to 'git-mergetool.txt')
| -rw-r--r-- | git-mergetool.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/git-mergetool.txt b/git-mergetool.txt index 5d3c63287..ff9700d17 100644 --- a/git-mergetool.txt +++ b/git-mergetool.txt @@ -26,7 +26,8 @@ OPTIONS --tool=<tool>:: Use the merge resolution program specified by <tool>. Valid merge tools are: - kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, ecmerge, and opendiff + kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, ecmerge, + diffuse, tortoisemerge and opendiff + If a merge resolution program is not specified, 'git-mergetool' will use the configuration variable `merge.tool`. If the |