mirror of
https://github.com/git/git.git
synced 2024-05-13 00:36:12 +02:00
f13f9b0eab
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>
2 lines
24 B
Plaintext
2 lines
24 B
Plaintext
. "$MERGE_TOOLS_DIR/bc"
|