Looking for a good diff/merge app for Mac

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?

2

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

1

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

3

Your Answer

Sign up or log in

Sign up using Google Sign up using Facebook Sign up using Email and Password Submit

Post as a guest

Post Your Answer Discard

By clicking “Post Your Answer”, you agree to our terms of service, privacy policy and cookie policy