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

difftool: support user-defined Beyond Compare setups correctly again
dscho · Nov 12, 2020 · ad95d13 · ad95d13
2 parents 3464b98 + c157c07
commit ad95d13
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git 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
@@ -25,4 +25,5 @@ translate_merge_tool_path() {
 list_tool_variants () {
 	echo bc
 	echo bc3
+	echo bc4
 }