BeeDiff is a graphical file comparator.  User have a possibility
to compare and merge a two text files.  All differences are highlighted
in colors.

WWW: http://www.beesoft.pl/index.php?id=beediff