Use Kaleidoscope as the git merge and diff tool