Sublime Merge, works on Windows/Linux/macOS. Its free unless you want the dark theme (easy to fix in a hex editor though I just bought a license I guess its a b

Sublime Merge, works on Windows/Linux/macOS. Its free unless you want the dark theme (easy to fix in a hex editor though I just bought a license I guess its a bit steep price for some people). On Windows, I used WinMerge a long time ago. Not sure how it is now, and its not available on macOS.