Hacker News new | ask | show | jobs
by luladjiev 2374 days ago
Another suggestion is Beyond Compare, the 3 way merge is a pro feature though:

https://www.scootersoftware.com/