Hacker News Reader

https://kaleidoscope.app/ is by far the best Mac solution.

For diffing yes but for merging... I have never gotten myself to use anything but DiffMerge. And now with their rewrite and price tag... Never ever.