Added kaleidoscope for merge and diff tools