Hacker News new | ask | show | jobs
by indigodaddy 2711 days ago
I prefer FileMerge. Built in to osx/xcode I believe.
1 comments
MordodeMaru 2711 days ago
Give Semantic Merge a try https://www.semanticmerge.com
link