Revert "Use Kaleidoscope as merge/diff tool."

This reverts commit f3702ff0eb2c3109bb5c9030ec442bc7c8a5e495.