Skip to content
Permalink
Browse files
Merge pull request #2899 from dscho/fix-beyond-compare
difftool: support user-defined Beyond Compare setups correctly again
  • Loading branch information
dscho committed Nov 12, 2020
2 parents 3464b98 + c157c07 commit ad95d13c656f72e7e12a8c6b3261b374a419d6c2
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 0 deletions.
@@ -138,6 +138,10 @@ setup_user_tool () {
merge_cmd () {
( eval $merge_tool_cmd )
}

list_tool_variants () {
echo "$tool"
}
}

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

0 comments on commit ad95d13

Please sign in to comment.