BeeDiff (beediff) is a program with graphical user interface (GUI) for comparing and merging files.

http://repo.openpandora.org/?page=detail&app=beediff-app