Hacker News Reader

Also: Beyond Compare - https://www.scootersoftware.com/features.php (Mac+PC+Linux)

I am adding Meld to the list.

Kaleidoscope is a Mac app. "On OS X, Meld is not yet officially supported"

> OSX users can install Meld using Homebrew (or Macports, Fink, etc.), or there are unofficial native builds available from the Meld for OSX project.

Its available in Homebrew to try.

The linked repo seems to be a fork of a mirror of the Gnome Meld [1] application.

[1] https://gitlab.gnome.org/GNOME/meld

Sublime Merge, works on Windows/Linux/macOS. Its free unless you want the dark theme (easy to fix in a hex editor though I just bought a license I guess its a bit steep price for some people).

On Windows, I used WinMerge a long time ago. Not sure how it is now, and its not available on macOS.

p4merge! Just `brew cask install p4v` and you're set. It supports viewing local, base and remote in three-way merges, which really helps when resolving conflicts IMHO.