What’s better than a Visual Merge Tool? A Visual Merge Tool that can talk to Git and tell you what a merge conflict is about. That’s exactly what Kaleidoscope 4.2 does. https://kaleidoscope.app
Git Diff and Merge Tool | Kaleidoscope

Spot the differences, merge in seconds.

@KaleidoscopeApp thank you! This always confused me!