Hacker News new | ask | show | jobs
by tomtheengineer 3652 days ago
Beyond Compare is the best I've found (especially for complex merges): http://www.scootersoftware.com/
2 comments

Me too. I tried ataxia for about 6 months and hated it, got told about beyond compare, paid for a license after only a few days of the trial .
Beyond Compare is great. I prefer Araxis. I think most people would be very happy with one of the two. Whichever you happen to prefer.