Diffuse – Graphical tool for comparing and merging text files

Diffuse is a graphical tool for comparing and merging text files. It can work with many revision control systems as a diff viewer or merge tool. Diffuse is able to compare an arbitrary number...