summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-10-29 17:08:03 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-10-29 17:08:04 (GMT)
commitc1777a297043a06d6c18d383d17447f5eefcdcbe (patch)
tree425021beccd0550006182fc43b52e56846551bce /contrib
parentd70e331c0e8eaeb0bd75ae3020c3be71de075ff7 (diff)
parentf13f9b0eab8ec4880be0e4423ebdcfdbcd41eeb6 (diff)
downloadgit-c1777a297043a06d6c18d383d17447f5eefcdcbe.zip
git-c1777a297043a06d6c18d383d17447f5eefcdcbe.tar.gz
git-c1777a297043a06d6c18d383d17447f5eefcdcbe.tar.bz2
Merge branch 'oc/mergetools-beyondcompare'
* oc/mergetools-beyondcompare: mergetool: rename bc3 to bc
Diffstat (limited to 'contrib')
-rw-r--r--contrib/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 8704451..2fece98 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1204,7 +1204,7 @@ _git_diff ()
}
__git_mergetools_common="diffuse diffmerge ecmerge emerge kdiff3 meld opendiff
- tkdiff vimdiff gvimdiff xxdiff araxis p4merge bc3 codecompare
+ tkdiff vimdiff gvimdiff xxdiff araxis p4merge bc codecompare
"
_git_difftool ()