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
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.