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

Earn badges and make progress

You're on your way to the next level! Join the Kudos program to earn points and save your progress.

Deleted user Avatar
Deleted user

Level 1: Seed

25 / 150 points

Next: Root

Avatar

1 badge earned

Collect

Participate in fun challenges

Challenges come and go, but your rewards stay with you. Do more to earn more!

Challenges
Coins

Gift kudos to your peers

What goes around comes around! Share the love by gifting kudos to your peers.

Recognition
Ribbon

Rise up in the ranks

Keep earning points to reach the top of the leaderboard. It resets every quarter so you always have a chance!

Leaderboard

Come for the products,
stay for the community

The Atlassian Community can help you and your team get more value out of Atlassian products and practices.

Atlassian Community about banner
4,555,983
Community Members
 
Community Events
184
Community Groups

External diff greyed out

Deleted user Mar 09, 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

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

Suggest an answer

Log in or Sign up to answer
TAGS
AUG Leaders

Atlassian Community Events