The best diff tool for OS X is IntelliJ?https://www.jetbrains.com/idea/help/running-intellij-idea-as-a-diff-or-merge-command-line-tool.html#d779632e149 by wpnx • 12 years ago 3 2 12 years agoJEjetbrains.com