4 ms·
Here are the alternatives: FileMerge - part of Xcode. Free. use opendiff to launch from CLI BBEdit - My go to editor for the Mac. Freemium. Available both on
by putlake 6y ago
Here are the alternatives:
FileMerge - part of Xcode. Free. use opendiff to launch from CLI
BBEdit - My go to editor for the Mac. Freemium. Available both on the Mac app store and their website as a download.
VS Code - Also free.
SourceTree - Acquired by Atlassian. Also free. Good for git context to diff branches, commits and modified but uncommitted files in current branch.
- de6u99er 6y agoI am adding Meld to the list. https://meldmerge.org/ https://meldmerge.org/
- apetrovic 6y agoKaleidoscope is a Mac app. "On OS X, Meld is not yet officially supported"
- Fnoord 6y ago> OSX users can install Meld using Homebrew (or Macports, Fink, etc.), or there are unofficial native builds available from the Meld for OSX project. Its available in Homebrew to try. The linked repo seems to be a fork of a mirror of the Gnome Meld [1] application. [1] https://gitlab.gnome.org/GNOME/meld https://gitlab.gnome.org/GNOME/meld
- marton78 6y agop4merge! Just `brew cask install p4v` and you're set. It supports viewing local, base and remote in three-way merges, which really helps when resolving conflicts IMHO.
- psyklic 6y agoAlso: Beyond Compare - https://www.scootersoftware.com/features.php https://www.scootersoftware.com/features.php (Mac+PC+Linux)
- Fnoord 6y agoSublime 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.