diff options
| author | Sebastian Schuberth <sschuberth@gmail.com> | 2011-02-27 14:32:46 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-02-28 23:42:38 +0300 |
| commit | ffe6dc081aa23d56e6306d143d99ca508db38c5e (patch) | |
| tree | 12e864eedadf5382d26d770786791d3cdeab30a7 /contrib | |
| parent | aa03f60463129194d328035f9974be4fa951dd44 (diff) | |
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 'contrib')
| -rwxr-xr-x | contrib/completion/git-completion.bash | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 893b7716ca..058c2a92b8 100755 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1358,7 +1358,7 @@ _git_diff () } __git_mergetools_common="diffuse ecmerge emerge kdiff3 meld opendiff - tkdiff vimdiff gvimdiff xxdiff araxis p4merge + tkdiff vimdiff gvimdiff xxdiff araxis p4merge bc3 " _git_difftool () |