Meld is a free, open-source, and cross-platform (UNIX/Linux, OSX, Windows) diff/merge tool.
Here’s how to install it on:
- Ubuntu
- Mac
- Windows: “The recommended version of Meld for Windows is the most recent release, available as an MSI from https://meldmerge.org”