On conflict, launch external tool doesn't appear to work

I'm using Kaleidoscope as my external merge/diff tool, but when i try to launch it via the right click menu on a conflicting file, it doesn't start (nor is the file automatically resolved)

This used to work in 2.1