Gui Diff with filemanager integration (thunar) - please recommend a good one

i must have becoming too old and lazy, but diff is not doing it for me anymore.

Ask:
what is the good gui tool for reviewing and creating diff data between files? Ideally i'd like to edit in place and have some sort of filemanager integration.

i'm on fxce, latest fedora. tried Kompare - sig faulted, diffuse - my brains didn't agree with their interface.