diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-10-20 15:49:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-10-21 11:25:30 -0700 |
| commit | f13f9b0eab8ec4880be0e4423ebdcfdbcd41eeb6 (patch) | |
| tree | d3df13f1d784d7b1796a469900a7cb7928f96ae5 /contrib | |
| parent | Merge branch 'maint-2.0' into maint (diff) | |
| download | tgif-f13f9b0eab8ec4880be0e4423ebdcfdbcd41eeb6.tar.xz | |
mergetool: rename bc3 to bc
Beyond Compare version 4 works the same way as version 3, so rename
the existing "bc3" adaptor to just "bc", while keeping "bc3" as a
backward compatible wrapper.
Noticed-by: Olivier Croquette <ocroquette@free.fr>
Helped-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib')
| -rw-r--r-- | 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 06bf262087..8a19b3e3fd 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1207,7 +1207,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 () |