Setting up Kaleidoscope as external merge and diff tool, keep Changes as another one for the time being.
Back to using a simple pull for alias p