FileMerge
Being part of its developer toolset, Apple's own merge tool comes at no additional costs. It might not be the most elegant tool, but it's definitely a solid one that does the job of comparing & merging text.
Beyond Compare
- MacBook Air; MacBook Pro. Demanding apps and complicated, intensive tasks do require Intel i7 because with the faster processor every program will run smoothly, but the battery life will be reduced. While i7 is a more expensive option, it is also a smart one for professional video editors, photographers, etc.
- The MacBook line offers three distinct choices: the 13-inch Air, 13-inch Pro and 16-inch Pro. Students who need a remote learning tool are going to naturally gravitate towards one of them.
- Customer Satisfaction. Probably the most striking difference between Macs and PCs is in customer.
There was a solution: with the latest 16.x release of Microsoft Office for Mac (released on Jan 18, 2018), there are fewer differences between Excel Windows and Mac. Given that, it is important to know them, especially when you have Mac at home and PC at work (or vice versa).
Originally a product for Microsoft Windows, the Beyond Compare team has contributed a fine diff tool to the Mac platform. Like Araxis Merge and DeltaWalker, it goes beyond (pun intended) comparing simple text and also allows diffing Word and PDF contents. In its 'Pro Version', it also supports merging.
Araxis Merge
One of the few diff tools that works with more than just text and image files, Araxis Merge lets you also compare office documents (like MS Word, Excel, Powerpoint, or ODF). It comes in standard and professional editions, and for people working on both macOS and Windows, it's great to know that a single license is valid for both platforms.
NEW: Image Diffing in Tower! Our popular Git client Tower now supports Image Diffing for a variety of formats (including PNG, JPG, GIF, BMP, TIFF, JPEG2000, and HEIC). In both the Working Copy and various History / Changeset views, you can now see the actual images - and how they were changed! Try it yourself - for free!
DeltaWalker
Just like Araxis, the DeltaWalker app also lets you compare office files. However, it goes one step further by letting you compare file archives like ZIP, JAR, and TAR files. Also, if you're regularly performing comparisons on a folder basis, DeltaWalker shines with a great performance in this area. DeltaWalker supports macOS, Windows and Linux.
Kaleidoscope
Although it has changed hands (i.e. owners) multiple times, Kaleidoscope is still one of the best diff & merge tools for the Mac. Its beautiful user interface and great image diffing capabilities are what set it apart. Kaleidoscope is also available for the iPad.
Difference Between Storage And Memory For Mac
Free Alternatives
In case you're looking for a free alternative to the standard FileMerge app, you should also have a look at P4Merge and DiffMerge.
Both can't compare in terms of features and user interface with their commercial competitors - but make for a valid alternative on macOS, Windows, and Linux.
Integrations
Another aspect to watch out for is integrations: before choosing your favorite tool, you should make sure that it plays nicely with the rest of your tool chain. I can already confirm that all of the mentioned tools work seamlessly at least with Tower, our own Git client.
If you don't need the power of a dedicated Diff tool application, the integrated diff views in Tower might be absolutely sufficient for you:
Dvd-r Vs Dvd+r Difference For Mac
In case you don't know Tower: it's the Git desktop client for Mac and Windows that helps thousands of developers and designers to easily & productively work with the Git version control system. Try it 30 days for free!
Conclusion
Diff & merge apps are amongst the most underestimated tools. But a good one can be really helpful in a lot of situations. Try one of the above and see for yourself!
Get the Git Cheat Sheet
Download one of the web's most popular resources on Git! It's free!