Set Kaleidoscope as an optional tool for merge and diff