diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh index 2defef28cd931f..7225abd81122e6 100644 --- 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 a89086ee720f84..26c19d46a5bdee 100644 --- a/mergetools/bc +++ b/mergetools/bc @@ -25,4 +25,5 @@ translate_merge_tool_path() { list_tool_variants () { echo bc echo bc3 + echo bc4 }