Meld - a great visual diff and merge tool for linux

Re:Meld - a great visual diff and merge tool for linux by qaexl on Monday December 27, 2010 @09:04AM (#2042505)

Meld is the only tool I know of that shows a 3-panel merge. That's the killer feature for me.

Now, if there were an OSX-native app that does 3-panel merges, I'd gladly switch off of Meld.

[ Parent | on HN ]

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 ]

Re:Meld - a great visual diff and merge tool for linux by naish on Monday December 27, 2010 @09:13AM (#2042539)

Araxis Merge might be what you are looking for (Professional version only).

http://www.araxis.com/merge/

Unfortunately, it is not inexpensive.

[ Parent | on HN ]

Re:Meld - a great visual diff and merge tool for linux by turtle4 on Monday December 27, 2010 @09:49PM (#2044430)

Diffmerge from sourcegear is free and runs natively on os x (in addition to win and Linux) and does 3 panel merges, as well as folder diffs pretty well.

[ Parent | on HN ]

Re:Meld - a great visual diff and merge tool for linux by kbd on Monday December 27, 2010 @09:51AM (#2042624)

kdiff3 works on mac

[ Parent | on HN ]