Git Diff and Merge Tool | Kaleidoscope

Spot the differences, merge in seconds.