diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-10-20 22:49:36 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-10-21 18:25:30 (GMT) |
| commit | f13f9b0eab8ec4880be0e4423ebdcfdbcd41eeb6 (patch) | |
| tree | d3df13f1d784d7b1796a469900a7cb7928f96ae5 /git-mergetool--lib.sh | |
| parent | 3c2dc76f015b4d52ef02a08c59a4546d00b475e1 (diff) | |
| download | git-f13f9b0eab8ec4880be0e4423ebdcfdbcd41eeb6.zip git-f13f9b0eab8ec4880be0e4423ebdcfdbcd41eeb6.tar.gz git-f13f9b0eab8ec4880be0e4423ebdcfdbcd41eeb6.tar.bz2 | |
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 'git-mergetool--lib.sh')
| -rw-r--r-- | git-mergetool--lib.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh index c45a020..a40d3df 100644 --- a/git-mergetool--lib.sh +++ b/git-mergetool--lib.sh @@ -250,7 +250,7 @@ list_merge_tool_candidates () { tools="opendiff kdiff3 tkdiff xxdiff meld $tools" fi tools="$tools gvimdiff diffuse diffmerge ecmerge" - tools="$tools p4merge araxis bc3 codecompare" + tools="$tools p4merge araxis bc codecompare" fi case "${VISUAL:-$EDITOR}" in *vim*) |