Guiffy
6.3#13 in file comparison software$24 one-timeLinuxmacOSWindows
Visit
Guiffy suits developers who need visual file or folder comparisons, or three-way merge conflict handling. Its stated end-of-life date is important for anyone considering it for ongoing use.
KDiff3 suits developers and other users who need to compare files or folders and resolve merge conflicts across desktop platforms.