Git: switch back to Kaleidoscope for diff/merge.

I'm a fickle creature.