I'm using SourceTree 2.0.5.2 on OSX 10.10 and have the latest Xcode and command line tools installed. When trying to do a merge and get conflicts, when launching the external merge tool, I get the window warning to quit the merge tool, then it disappears and nothing happens. Is there a place that an error would be logged?
I'm using FileMerge as the default. I can open it up via spotlight no problem. This used to work a couple of months ago.