Diff tool in SourceTree

Question

I am using SourceTree as a Git client in my windows 7. I faced with a conflict and in order to resolve I click on Launch external merge tool as suggested. A window pops up very shortly and nothing happens then after!

I just tried it on my Mac OS and it shows external merge tool as expected.

under Tools -> Options -> Diff -> External Diff / Merge dropdown box, System Default is selected.

I expect to see the diff merge tool but it never shows up in my windows, anyone know what could be the reason?

Solution 1

Do you have a diff tool installed on your system?

In Mac, when you install Xcode you get a diff tool named FileMerge, simple but sufficient in most of the cases. You can try WinMerge for Windows, I've used it in the past and it's pretty nice, and open source.

You can also try the P4 Merge tool from Perforce which is offered for free.

Both options can be selected as a Diff/Merge Tool in SourceTree.

Solution 2

I suggest installing Kdiff3 as a diff tool. It's the best I've seen so far.

Then set it as the diff tool on SourceTree:

• SourceTree/Tools/Options/Diff

The full tutorial is illustrated here: http://oliverbusse.notesx.net/hp.nsf/tutorial.xsp?documentId=C6A

Note that you must change both values for it to work. Otherwise it failed for me.

Solution 3

Beyond Compare works great too on Mac. It supports Windows and Linux too, but I have not tried.

You can download it from https://www.scootersoftware.com/download.php and make sure you also install command line tools from top menu bar when you open Beyond Compare first time because Source Tree External Diff won't work without command line tools installed