Hacker News new | ask | show | jobs
by BeetleB 1547 days ago
You need the Pro version to do a 3-way merge.