diff options
author | Sebastian Schuberth <sschuberth@gmail.com> | 2011-02-27 12:32:46 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-02-28 12:42:38 -0800 |
commit | ffe6dc081aa23d56e6306d143d99ca508db38c5e (patch) | |
tree | 12e864eedadf5382d26d770786791d3cdeab30a7 /Documentation/git-difftool.txt | |
parent | aa03f60463129194d328035f9974be4fa951dd44 (diff) | |
download | git-ffe6dc081aa23d56e6306d143d99ca508db38c5e.tar.gz |
mergetool--lib: Add Beyond Compare 3 as a tool
Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
Tested-by: Chris Packham <judge.packham@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-difftool.txt')
-rw-r--r-- | Documentation/git-difftool.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt index 4c8825d193..f087eff876 100644 --- a/Documentation/git-difftool.txt +++ b/Documentation/git-difftool.txt @@ -31,7 +31,7 @@ OPTIONS --tool=<tool>:: Use the diff tool specified by <tool>. Valid merge tools are: - araxis, diffuse, emerge, ecmerge, gvimdiff, kdiff3, + araxis, bc3, diffuse, emerge, ecmerge, gvimdiff, kdiff3, kompare, meld, opendiff, p4merge, tkdiff, vimdiff and xxdiff. + If a diff tool is not specified, 'git difftool' |