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

It's not the same without you

Join the community to find out what other Atlassian users are discussing, debating and creating.

Atlassian Community Hero Image Collage

External diff greyed out

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

 

0 answers

Suggest an answer

Log in or Sign up to answer
TAGS
Community showcase
Published in Sourcetree

Tip from the team: configure your repos for hosting goodness!

Supported Platforms macOS Windows We recently introduced support for additional hosting services such as GitHub Enterprise, GitLab (Cloud, Community Edition, Enterprise Edition), and...

5,717 views 4 12
Read article

Community Events

Connect with like-minded Atlassian users at free events near you!

Find an event

Connect with like-minded Atlassian users at free events near you!

Unfortunately there are no Community Events near you at the moment.

Host an event

You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events

Events near you