3 ms·

I prefer FileMerge. Built in to osx/xcode I believe.

• MordodeMaru 8y ago
  Give Semantic Merge a try https://www.semanticmerge.com https://www.semanticmerge.com