xxdiff

A graphical front end to the diff command

xxdiff is a graphical browser for viewing the differences between two files and can be used to produce a merged version. The text of the two or three files are presented side by side with their differences highlighted for easy identification.