Git Diff and Merge Tool and Text Comparison | Kaleidoscope
Spot the differences, merge in seconds.
www.kaleidoscopeapp.com