git/mergetools/bc, branch v2.6.2Mirror of https://git.kernel.org/pub/scm/git/git.git/
https://git.shady.money/git/atom?h=v2.6.22014-10-21T18:25:30Zmergetool: rename bc3 to bc2014-10-21T18:25:30ZJunio C Hamanogitster@pobox.com2014-10-20T22:49:36Zurn:sha1:f13f9b0eab8ec4880be0e4423ebdcfdbcd41eeb6
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>