Try out Kaleidoscope as diff/mergetool