diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-03-19 23:24:27 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-19 23:24:27 -0700 |
| commit | 9d59e6607a597a0a934566bfa547b45c7b57822c (patch) | |
| tree | c3ff191357256ec88cfb7f770e5b10554c16e34d /Documentation/git-difftool.txt | |
| parent | f4784b3eab2e12e7a8fda7431572753f3a970c63 (diff) | |
| parent | ffe6dc081aa23d56e6306d143d99ca508db38c5e (diff) | |
| download | git-9d59e6607a597a0a934566bfa547b45c7b57822c.tar.gz | |
Merge branch 'ss/mergetool--lib'
* ss/mergetool--lib:
mergetool--lib: Add Beyond Compare 3 as a tool
mergetool--lib: Sort tools alphabetically for easier lookup
Diffstat (limited to 'Documentation/git-difftool.txt')
| -rw-r--r-- | Documentation/git-difftool.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt index a5d9c121f1..590f410abf 100644 --- a/Documentation/git-difftool.txt +++ b/Documentation/git-difftool.txt @@ -31,8 +31,8 @@ OPTIONS --tool=<tool>:: Use the diff tool specified by <tool>. Valid merge tools are: - kdiff3, kompare, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, - ecmerge, diffuse, opendiff, p4merge and araxis. + araxis, bc3, diffuse, emerge, ecmerge, gvimdiff, kdiff3, + kompare, meld, opendiff, p4merge, tkdiff, vimdiff and xxdiff. + If a diff tool is not specified, 'git difftool' will use the configuration variable `diff.tool`. If the |