HN
Hacker News
Top
New
Best
Ask
Show
Jobs
Comment by indigodaddy | Hacker News Reader
Parent
Full thread
indigodaddy
·
I prefer FileMerge. Built in to osx/xcode I believe.
View on HN
MordodeMaru
·
Give Semantic Merge a try
https://www.semanticmerge.com
Reply on news.ycombinator.com