diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-03-20 06:24:27 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-20 06:24:27 (GMT) |
| commit | 9d59e6607a597a0a934566bfa547b45c7b57822c (patch) | |
| tree | c3ff191357256ec88cfb7f770e5b10554c16e34d /contrib | |
| parent | f4784b3eab2e12e7a8fda7431572753f3a970c63 (diff) | |
| parent | ffe6dc081aa23d56e6306d143d99ca508db38c5e (diff) | |
| download | git-9d59e6607a597a0a934566bfa547b45c7b57822c.zip git-9d59e6607a597a0a934566bfa547b45c7b57822c.tar.gz git-9d59e6607a597a0a934566bfa547b45c7b57822c.tar.bz2 | |
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 '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 0b0b913..ccdc172 100755 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1360,7 +1360,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 () |