Logo Questions Linux Laravel Mysql Ubuntu Git Menu
 

How to link external diff tool(beyond compare) in source tree?

I am using Source tree client for Git on windows 7. I have used beyond compare with tortoisehg client for mercurial and I like to use Beyond compare itself as diff too in SourceTree too. I set the diff tool to beyond compare in Tools -> Options but not sure how to launch diff too via source tree for any file. Double click on file should usually bring up diff view. Right-click -> Custom action also does nothing.

Beyond compare 3.3.13 & source tree 2.1.2.5

Please let me know how to configure this.

like image 773
vinmm Avatar asked Mar 09 '23 19:03

vinmm


2 Answers

It works for me:

  1. After the installation, check whether you have set this in SourceTree options:

Beyond Compare Link with SourceTree

  1. Right click on the file(s) you want to compare and fire up Beyond Compare:

Firing up BeyondCompare Tool

Beyond Compare 4.2.2 & SourceTree 2.1.2.5

Also please make sure your Beyond Compare trial period has not ended

like image 111
Sahan Serasinghe Avatar answered Mar 11 '23 09:03

Sahan Serasinghe


In addition of the file compare/merge, I use the sourcetree custom actions in order to compare two commits as folder comparison.

Assuming git & beyond compare in the PATH, you can add this following custom action in Sourcetree (Tools > Option > Custom Actions):

Script: git
Parameters: difftool -d --tool=bc4 $SHA

Tested with Sourcetree 3.4.8, git 2.35, beyond compare 4.4.2

like image 25
wejoey Avatar answered Mar 11 '23 11:03

wejoey