Merge branch 'pd/mergetool-nvimdiff'

Fix regression introduced when nvimdiff support in mergetool was added.

* pd/mergetool-nvimdiff:
  mergetool: avoid letting `list_tool_variants` break user-defined setups
  mergetools/bc: add `bc4` to the alias list for Beyond Compare

diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
index 2defef28cd931fc9dca041ee7ec0ea5d440c3dd7..7225abd81122e6bd798989d6e21fae1279cf3929 100644 (file)
--- a/git-mergetool--lib.sh
+++ b/git-mergetool--lib.sh
@@ -138,6 +138,10 @@ setup_user_tool () {
        merge_cmd () {
                ( eval $merge_tool_cmd )
        }
+
+       list_tool_variants () {
+               echo "$tool"
+       }
 }
 
 setup_tool () {

diff --git a/mergetools/bc b/mergetools/bc
index a89086ee720f842359eefe58f369af2774457438..26c19d46a5bdee5739b9a9425cc48fac3efd6bfb 100644 (file)
--- a/mergetools/bc
+++ b/mergetools/bc
@@ -25,4 +25,5 @@ translate_merge_tool_path() {
 list_tool_variants () {
        echo bc
        echo bc3
+       echo bc4
 }