aboutsummaryrefslogtreecommitdiff
path: root/khash.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-10-20 15:49:36 -0700
committerJunio C Hamano <gitster@pobox.com>2014-10-21 11:25:30 -0700
commitf13f9b0eab8ec4880be0e4423ebdcfdbcd41eeb6 (patch)
treed3df13f1d784d7b1796a469900a7cb7928f96ae5 /khash.h
parent3c2dc76f015b4d52ef02a08c59a4546d00b475e1 (diff)
downloadgit-f13f9b0eab8ec4880be0e4423ebdcfdbcd41eeb6.tar.gz
git-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 'khash.h')
0 files changed, 0 insertions, 0 deletions