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