Use Kaleidoscope as the diff and merge tool