News for hackers. Stuff that matters.

A comment on Meld - a great visual diff and merge tool for linux. Parent comment

Re:Meld - a great visual diff and merge tool for linux by j_s on Monday December 27, 2010 @11:58AM (#2042913)
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...

[ Parent | on HN ]
Re:Meld - a great visual diff and merge tool for linux by qaexl on Monday December 27, 2010 @01:58PM (#2043289)
Xmerge looks great. Too bad I'm on git.
[ Parent | on HN ]
Re:Meld - a great visual diff and merge tool for linux by psantosl on Monday December 27, 2010 @07:21PM (#2044110)
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?? :)
[ Parent | on HN ]