diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2007-06-11 01:21:54 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2007-06-11 01:21:54 +0000 |
| commit | f614c6470329dcb81603708f9710d5dd2c3a9c43 (patch) | |
| tree | ae083e8c046fa8813139d4fa6096b6e156b48bb7 /git-mergetool.txt | |
| parent | 4ec0671755f7d81966311dd0e8cace8abf1aeb13 (diff) | |
| download | git-htmldocs-f614c6470329dcb81603708f9710d5dd2c3a9c43.tar.gz | |
Autogenerated HTML docs for v1.5.2.1-174-gcd03
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 b89c51c65..6c32c6d18 100644 --- a/git-mergetool.txt +++ b/git-mergetool.txt @@ -25,7 +25,7 @@ OPTIONS -t or --tool=<tool>:: Use the merge resolution program specified by <tool>. Valid merge tools are: - kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, and opendiff + kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, and opendiff + If a merge resolution program is not specified, 'git mergetool' will use the configuration variable merge.tool. If the |