Hacker News Reader

Looking at the page, it doesn't seem as if it has 3-way-merge, which is something I'd expect from a merge tool with such a price tag.

View on HN

I was trying this briefly last night. It does have 3-way-merge when you integrate it with your source control tool, however I couldn't seem to find a way to use this functionality when you're just using it standalone.

Reply on news.ycombinator.com