Meld
Visual diff and merge tool
...The tool integrates with many popular version control systems, helping developers better understand patches and project history. Widely used on Linux and available for Windows, Meld is a reliable solution for managing and understanding differences in code and files.