XXDiff is a graphical viewer for comparing two or three files, or two directories, and creating a merged version. It allows users to interactively merge files and visualize the output, which can then be saved. Unfortunately, this application does not support files encoded with Unicode.
