WinMerge is an Open Source visual text file differencing and merging tool for Win32 platforms. It is highly useful for determing what has changed between project versions, and then merging changes between versions. It features visual differencing and merging of text files, a flexible editor with syntax highlighting, line numbers and word-wrap and handles DOS, UNIX and MAC text file formats. It also includes full support for archives with the bundled 7-Zip plugin. Both the 32-bit and 64-bit versions are included for maximum performance on every PC.
Source code:https://github.com/WinMerge/