mergetool: rename bc3 to bc
commitf13f9b0eab8ec4880be0e4423ebdcfdbcd41eeb6
authorJunio C Hamano <gitster@pobox.com>
Mon, 20 Oct 2014 22:49:36 +0000 (20 15:49 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 21 Oct 2014 18:25:30 +0000 (21 11:25 -0700)
treed3df13f1d784d7b1796a469900a7cb7928f96ae5
parent3c2dc76f015b4d52ef02a08c59a4546d00b475e1
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>
contrib/completion/git-completion.bash
git-mergetool--lib.sh
mergetools/bc [copied from mergetools/bc3 with 100% similarity]
mergetools/bc3