mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-11 12:30:12 +01:00
Code
230ce07d13
git/mergetools/bc3

2 lines
24 B
Plaintext
Raw Normal View History

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>
2014-10-21 00:49:36 +02:00
. "$MERGE_TOOLS_DIR/bc"
Copy Permalink