diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-07-24 15:05:15 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-07-24 15:05:15 -0700 |
| commit | 28a85beb3e536460e7d67f5ddb67c1096cb7cba1 (patch) | |
| tree | 9de9f40a9fe12231e26562fd220d1b2c382a3374 /git-mergetool.txt | |
| parent | 44dcd493a7896aabe2b48b0a2935633538d81f7c (diff) | |
| download | git-htmldocs-28a85beb3e536460e7d67f5ddb67c1096cb7cba1.tar.gz | |
Autogenerated HTML docs for v1.7.12-rc0-10-g476109
Diffstat (limited to 'git-mergetool.txt')
| -rw-r--r-- | git-mergetool.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/git-mergetool.txt b/git-mergetool.txt index 2a49de7cf..d7207bd9b 100644 --- a/git-mergetool.txt +++ b/git-mergetool.txt @@ -27,9 +27,9 @@ OPTIONS -t <tool>:: --tool=<tool>:: Use the merge resolution program specified by <tool>. - Valid merge tools are: - araxis, bc3, diffuse, ecmerge, emerge, gvimdiff, kdiff3, - meld, opendiff, p4merge, tkdiff, tortoisemerge, vimdiff and xxdiff. + Valid values include emerge, gvimdiff, kdiff3, + meld, vimdiff, and tortoisemerge. Run `git mergetool --tool-help` + for the list of valid <tool> settings. + If a merge resolution program is not specified, 'git mergetool' will use the configuration variable `merge.tool`. If the |