Showing results for 
Search instead for 
Did you mean: 
Sign up Log in

External diff greyed out

Deleted user March 9, 2021

SourceTree version 3.4.4 in Windows 10

External diff tool is grayed out when right-clicking in the unstaged window after a merge conflict.

I've seen a previous post on this that does not apply i,e, In the Options/General Allow Sourcetree to modify your global Git and Mecurial config files is checked

In the Diff tab both the diff and the merge command are set to

C:\Program Files (x86)\WinMerge\WinMergeU.exe

the .gitconfig in my home directory has the following lines

[difftool "sourcetree"]
cmd = 'C:/Program Files (x86)/WinMerge/WinMergeU.exe' \"$LOCAL\" \"$REMOTE\"
[mergetool "sourcetree"]
cmd = 'C:/Program Files (x86)/WinMerge/WinMergeU.exe' \"$LOCAL\" \"$REMOTE\"
trustExitCode = true

I'd appreciate any help or workaround


1 answer

0 votes
Christoffer Dam Bruun
I'm New Here
I'm New Here
Those new to the Atlassian Community have posted less than three times. Give them a warm welcome!
May 23, 2023

When you have merge conflicts then use "Resolve Conflicts"->"Launch External Merge Tool" instead

Suggest an answer

Log in or Sign up to answer
AUG Leaders

Atlassian Community Events