trying Kaleidoscope as my default Git merge and diff tool