Lauch external merge tool (kdiff3) not working

I have kdiff3 installed on my mac in the usual /Applications/ but source tree does not lauch it when kdiff3 is selected at the merge tool.

I have it in the path also so that kdiff3 can be launched from the command line so I tried setting external merge tool to "other" and using the command maually. Again nothing launched.

3 answers

Just double checked in SourceTree and nothing makes it clear that the file had been delete in a previous commit that you are trying to merge with.

Indeed, the merge tool does not launch if one of the conflicting actions is a delete. (I agree completely that it should not do this silently.)

Just realised that the merge conflict was because the other file was deleted which may be why the merge tool will not launch. Might be worth throwing up a message though to explain to the user why the merge tool is not appropriate or will not work.

Suggest an answer

Log in or Sign up to answer
Community showcase
Published yesterday in Statuspage

194 years of downtime: looking back on incident data from 2018

Statuspage customers logged more than 194 years of collective incidents in 2018. That’s a whopping 87% increase from the  104 years logged in 2017 , and we aren’t even through December yet....

56 views 1 5
Read article

Atlassian User Groups

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

Find a group

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

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you