diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-08-06 15:30:18 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-08-06 15:30:18 -0700 |
| commit | f52a386ef256fbea1618affd85cf62ad8283b2f7 (patch) | |
| tree | 05751e940605bdf0b26b47e92e01f1cb93ecc55b /Documentation | |
| parent | 0e4c8822e98e27c3c63125570c8bcbf0a8fd34da (diff) | |
| parent | 109859e27445a3ad12eb8f8cba43a5aa8f701733 (diff) | |
| download | git-f52a386ef256fbea1618affd85cf62ad8283b2f7.tar.gz | |
Merge branch 'jc/mergetool-tool-help' into maint
* jc/mergetool-tool-help:
mergetool: support --tool-help option like difftool does
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-mergetool.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/git-mergetool.txt b/Documentation/git-mergetool.txt index 2a49de7cfe..d7207bd9b9 100644 --- a/Documentation/git-mergetool.txt +++ b/Documentation/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 |