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 of files side-by-side (n-way merge), and gives the user the ability to manually correct line matching and directly edit the files.
