Hacker News new | ask | show | jobs
by j_s 5649 days ago
I believe the cross-platform (so semi-native) PlasticSCM's included xmerge has what you're looking for:

http://codicesoftware.blogspot.com/2010/07/xmerge-to-merge-r...
1 comments
qaexl 5649 days ago
Xmerge looks great. Too bad I'm on git.
link
psantosl 5649 days ago
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?? :)
link