Meld is a free, open-source, and cross-platform (UNIX/Linux, OSX, Windows) diff/merge tool.
Here's how to install it on:
2.1m questions
2.1m answers
60 comments
57.0k users