Available for Windows/Linux, you can use Meld from MacPorts.

Command line interface for easy integration with existing tools, including git mergetool.

Meld supports many version control systems, including Git, Mercurial, Bazaar and SVN.

Use the built-in regex text filtering to ignore uninteresting differences.

Easily navigate between differences and conflicts.

Two- and three-way comparison of files and directories.

It provides two- and three-way comparison of both files and directories, and has support for many popular version control systems. Meld helps you compare files, directories, and version controlled projects. Meld is a visual diff and merge tool targeted at developers.

Free but you can buy pro version if you need 3-way merge 2.

Beyond Compare's intuitive Folder Sync interface lets you reconcile differences in your data automatically.

You can then merge the changes, synchronize your files, and generate reports for your records. By using simple, powerful commands you can focus on the differences you're interested in and ignore those you're not.

Beyond Compareīeyond Compare allows you to quickly and easily compare your files and folders.

In previous article, I have mentioned Best Keycloak Alternatives (Open Source) but now in this article, I have mentioned Best WinMerge Alternative Diff Tool (Free and Open Source) with it's features.

Free winmerge for mac