Kaleidoscope

The leading diff and merge app for developers on the Mac