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.

WWW: http://furius.ca/xxdiff/

- Pete
petef@FreeBSD.org