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

External Merge tool Conflicts not displayed

Nesay Udai June 19, 2020

Hi

I am using SourceTree with Beyond Compare and kdiff3 . This has always worked fine. Today, when I right click->resolve using external diff tool, I get a window for a second showing that the launch is happening, and then nothing and the conflict disappears as though resolved. This is really bad as I am unable to merge changes.

Going into preferences, I tried to change the diff tool, but I can't click on any of the values - everything seems to be locked.

Help?

My Config.jpgAnswer

0 answers

Suggest an answer

Log in or Sign up to answer
TAGS
AUG Leaders

Atlassian Community Events