Lauch external merge tool (kdiff3) not working

[Max Edwards]

I have kdiff3 installed on my mac in the usual /Applications/kdiff3.app/Contents/MacOS/kdiff3 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.

[Max Edwards]

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.

[Balázs Szakmáry]

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.)

[Max Edwards]

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.