Kompare
Diff/Patch Frontend

Kompare is a GUI front-end program that enables differences between source files to be viewed and merged.
It can be used to compare differences on files or the contents of folders,
and it supports a variety of diff formats and provide many options to customize the information level displayed.