Git Diff Tool For Mac
FileMerge
Git config --global diff.tool bc3 git config --global difftool.prompt false git config --global merge.tool bc3 This simple setup will leave git diff and git merge functioning as usual, as well as allowing you to use Beyond Compare for the task by doing git difftool and git mergetool. I believe this works in IntelliJ >= 10.5 (or similar vintage of the other tools), but I've only actually tested it with IntelliJ 12. Once you're set up, just use git difftool or git mergetool to invoke your sweet new diff. Kaleidoscope is the world’s most powerful file comparison app. Compare different text files, images, and folders on your Mac and iPad. Review and merge changes in a matter of seconds (merging available only on the Mac). Configure DiffMerge for Your Git DiffTool. DiffMerge is an excellent diff tool that works on all platforms and one I’ve recently adopted as my primary diff tool. Git is easily the best source control system under the sun and also works across platforms. Here I’ll show you how to use them in tandem across Windows, Mac OS X and Ubuntu.
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.
- I have recently started using Git Kraken by Axosoft for my personal projects and I am really amazed by how great it is. It is cross platform and is available for Linux, Mac and Windows. Though I don’t get to use it all the time, it is a great tool to have with you.
- I have recently started using Git Kraken by Axosoft for my personal projects and I am really amazed by how great it is. It is cross platform and is available for Linux, Mac and Windows. Though I don’t get to use it all the time, it is a great tool to have with you.
Change Git Diff Tool
Beyond Compare
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). For people working on both Windows and Mac, it's great to know that a single license is valid for both platforms.
Free Git Diff Tool Mac
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.
Kaleidoscope
Originally developed by 'Sofa', Kaleidoscope was later acquired by 'BlackPixel' - who did a great job in making it one of the best diff & merge tools for the Mac. Its beautiful user interface and great image diffing capabilities are what set it apart.
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 Mac, Windows, and Linux.
Diff Tool For Mac
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.
Git Set Default Diff Tool
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:
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!