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.
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.
We're looking for participants for another workshop at Atlassian! We need Jira admins who have interesting custom workflows, issue views, or boards. Think you have a story to sh...
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!
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