Add Kaleidoscope as merge and diff tools for git
Add Kaleidoscope as merge and diff tools for mercurial