Here are which I've found:. FileMerge ( opendiff) It's bundled with Xcode with Command Line Tools installed. Open sourced beautifier and language aware code comparison tool for many languages. Can be installed using via command: brew install meld. Can be installed using via command: brew install tkdiff.

Available at App Store. Commercial with free trial. Commercial with free trial.

No longer in Homebrew, it has not been developed/updated since 2014. See also: and at Wikipedia for the full list. Stumbled upon this thread today and thought I'd contribute this new cross-platform OSS diff tool that supports file and directory comparision. It is a good alternative to WinMerge for Mac. Meld is a visual diff and merge tool targeted at developers.

Meld helps you compare files, directories, and version controlled projects. It provides two- and three-way comparison of both files and directories, and has support for many popular version control systems.

Meld helps you review code changes and understand patches. It might even help you to figure out what is going on in that merge you keep avoiding. Perforce, a source control application, has a free. diff and merge tool that is cross platform and works fine on my mac. It's called P4Merge. It presents file-diffs very nicely and handles three-way merges like a champ. As a long-time WinMerge user I was very happy with it.

Its use of little gem-like icons in a 3-way merge takes some getting used to. One icon is for my change, one for their's, and one for the common ancestor.

Once you get that straight it was very helpful. it was free, but may now be subject to Perforce's licensing. Perforce in-general is restricted to a certain number of users and/or files unless you buy it. However, these restrictions only make sense when using their server-side software. These client-only tools can't really be licensed like that. I'll update if I ever hear back from the company on this matter.

Mac Merge Tool

I am a Mac user attached to elegance and esthetics as a significant factor in productivity for cognitive reasons. A fully native and elegant Human Interface is for me of paramount importance. I tried many contenders (Araxis, P4Merge and many others).

I purchased several. I loved Changes for a long while. Now my favorite is Kaleidoscope. It provides 3-way merge, it can compare images in a smart way, it has a slick and elegant interface. When an application claims to be cross-platform, that rings an alarm bell. More often than not, it means an ugly, non-native interface.

Windiff For Mac

Having to cringe when working is not my idea of having fun at work. You don't disagree. I wrote 'More often than not'.

It is my experience that cross-platform apps 'more often than not' fail to feel native. 'look sensible' is easy, but far from enough. I prefer native apps, despite the risk of lock in, because frankly, I don't want to spend many hours cringing every step of the way because of the uncanny valley an app has dug itself in, by trying, but mostly failing, to feel native while staying cross platform. An example of such an (otherwise excellent) application is YNAB.

Winmerge Macro

– Mar 30 '14 at 12:27.