Use Kaleidoscope as merge/diff tool.