Hacker News new | ask | show | jobs
by chiph 4921 days ago
I've been happy with BeyondCompare. Reasonably priced, does 3-way merges, configurable with many version control systems. Now with Linux & Windows versions (but not a OS X version yet)