DiffMerge is a curious free tool that allows the user to compare and merge files from three operating systems: Windows, Mac OS X and Unix.
It includes the following tools: Diff (shows the differences between two obvious files at a glance and includes support for editing the images), Merge (shows the changes between three files and allows automatic mergers and total control to edit the final product), and Folder Diff (makes comparisons of two folders, showing which files in one are in the other).
DiffMerge allows deep configuration. In addition, it is prepared to operate with encodings of 42 different characters.
You can free download DiffMerge and safe install the latest trial or new full version for Windows 10 (x32, 64 bit, 86) from the official site.
Devices: Desktop PC, Laptop (ASUS, HP, DELL, Acer, Lenovo, MSI), Ultrabook
OS: Professional, Enterprise, Education, Home Edition, versions: 1507, 1511, 1607, 1703, 1709, 1803, 1809