aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-03-19 23:24:27 -0700
committerJunio C Hamano <gitster@pobox.com>2011-03-19 23:24:27 -0700
commit9d59e6607a597a0a934566bfa547b45c7b57822c (patch)
treec3ff191357256ec88cfb7f770e5b10554c16e34d /contrib
parentf4784b3eab2e12e7a8fda7431572753f3a970c63 (diff)
parentffe6dc081aa23d56e6306d143d99ca508db38c5e (diff)
downloadgit-9d59e6607a597a0a934566bfa547b45c7b57822c.tar.gz
git-9d59e6607a597a0a934566bfa547b45c7b57822c.tar.xz
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-xcontrib/completion/git-completion.bash2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 0b0b913d2..ccdc172a0 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 ()