3 ms·

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'

by qaexl 16y ago

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.

naish 16y ago
Araxis Merge might be what you are looking for (Professional version only). http://www.araxis.com/merge/ http://www.araxis.com/merge/ Unfortunately, it is not inexpensive.
kbd 16y ago
kdiff3 works on mac
j_s 16y 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-refactored-code.html http://codicesoftware.blogspot.com/2010/07/xmerge-to-merge-r...
- qaexl 16y ago
  Xmerge looks great. Too bad I'm on git.
  - psantosl 16y 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?? :)
turtle4 16y ago
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.