Demo of this beautiful game is finally available for Linux.
Beyond Compare allows you to quickly and easily compare your files and folders. By using simple, powerful commands you can focus on the differences you're interested in and ignore those you're not. You can then merge the changes, synchronize your files, and generate reports for your records.
Guiffy is a diff tool, merge tool, and folder compare tool all-in-one that makes comparing and merging sources as easy and reliable as possible.