You're on your way to the next level! Join the Kudos program to earn points and save your progress.
Level 1: Seed
25 / 150 points
Next: Root
1 badge earned
Challenges come and go, but your rewards stay with you. Do more to earn more!
What goes around comes around! Share the love by gifting kudos to your peers.
Keep earning points to reach the top of the leaderboard. It resets every quarter so you always have a chance!
Join now to unlock these features and more
The Atlassian Community can help you and your team get more value out of Atlassian products and practices.
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
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.