Diff tool in SourceTree

git version-control atlassian-sourcetree
Ali picture Ali · Jun 3, 2015 · Viewed 63.3k times · Source

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?

Answer

Ricardo Amores picture Ricardo Amores · Jun 4, 2015

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.

Related questions

What is the alternate of Source Tree for Ubuntu 16.04?

I am new to Linux environment and till now I was using source tree on windows to transfer files on server. Now I am using Ubuntu 16.04. What is the alternate of Source Tree for Ubuntu 16.04? Thanks

Read More
.gitignore doesn't ignore files

My .gitignore file gets ignored and the files which should be ignored are still visible. user@host ~/workdir % git status # On branch master # Changed but not updated: # (use "git add <file>..." to update what will be committed) # (use "…

Read More
Finishing a feature branch with GIT Flow

From my understanding one of the advantages of creating feature branches is so that you can easily see where large groups of commits have been merged into the develop branch. Upon finishing a feature branch the recommendation is to delete …

Read More