xxdiff

xxdiff is a graphical browser for viewing the differences between two or three files, or between two directories, and can be used to produce a merged version.

Files can be merged interactively and resulting output visualized and saved. This application does not support comparing files encoded with Unicode.