Take the 2-minute tour ×
Super User is a question and answer site for computer enthusiasts and power users. It's 100% free, no registration required.

When working on Windows i use WinMerge. I am looking for something similar for Mac.

I need to be able to merge files and folders (recursively).

Any suggestions?

share|improve this question

migrated from stackoverflow.com Mar 27 '12 at 10:44

This question came from our site for professional and enthusiast programmers.

    
Off topic here. But I'll guess that Emacs might have some variant on Mac which fits the bill. –  Basile Starynkevitch Mar 11 '12 at 15:43
1  
I have been using meld in ubuntu for sometime now, it is good and from their site I see they have an OS X version also. Here is the link [meldmerge.org/] –  prajeesh kumar Mar 11 '12 at 16:02
add comment

2 Answers

FileMerge is a tool that comes with Xcode. In Terminal.app you can do a diff with it, named opendiff there. See man opendiff

share|improve this answer
add comment

Kaleidoscope for diff, Gitbox for merging (you'll have to use Git though). The two can work together.

share|improve this answer
    
is there anything free? –  Erik Sapir Mar 11 '12 at 15:48
    
The already mentioned FileMerge.app as well as all the commandline tools are free. –  MacLemon May 28 at 0:52
add comment

Your Answer

 
discard

By posting your answer, you agree to the privacy policy and terms of service.