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
When you have merge conflicts then use "Resolve Conflicts"->"Launch External Merge Tool" instead
Online forums and learning are now in one easy-to-use experience.
By continuing, you accept the updated Community Terms of Use and acknowledge the Privacy Policy. Your public name, photo, and achievements may be publicly visible and available in search engines.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.