Use Kaleidoscope for diffing & merging