Added diff/merge settings for Kaleidoscope.