Merge pull request #2899 from dscho/fix-beyond-compare

difftool: support user-defined Beyond Compare setups correctly again

Author: dscho

Diff for: 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 for: mergetools/bc

@@ -25,4 +25,5 @@ translate_merge_tool_path() {
 list_tool_variants () {
 	echo bc
 	echo bc3
+	echo bc4
 }