Code Compare is a free tool designed to compare and merge differing files and folders. Developed by Devart
License: Freemium
Apps available for Windows
Beyond Compare is a handy comparison tool to compare files.
License: Commercial
Apps available for Mac Windows Linux