Hacker News Reader

I believe the cross-platform (so semi-native) PlasticSCM's included xmerge has what you're looking for:

Xmerge looks great. Too bad I'm on git.

You can always switch to Plastic!! Now it is FREE, didn't you know. Or, as last resort: why don't you use Xmerge with Git?? :)