35

I am looking for a tool that is able to compare directories, not only files. Also it is important to be able to call the tool from the command line.

It would be great to have a free tool, if not free please specify the price.

4

For all the googlers... check out Beyond Compare it rules. Costs 30$ or 50$ for Pro version.

  • I usually try to avoid recommending commercial solution when free and open source alternatives exists but BeyondCompare is a special case where it does worth every penny... and is also multi platform. I have been using it for more 10 years and waited to long to get the MacOS version. – sorin Feb 15 '17 at 10:14
31

FileMerge (free), shipped with Xcode, offers a directory view.
A command line version is available through the Terminal application opendiff.

  • 2
    I would like to choose this answer because opendiff could be considered almost "bundled" with the OS X but when I tries to diff two folders it opened an ugly view that was not so easy to understand and also I was not able to see how do I merge two files in file view. I'm sure it is possible but if this basic feature is not obvious, I will prefer to look for something better ;) – sorin Mar 16 '11 at 17:22
18

Built-in utility for macOS and Linux

If you don't mind using the terminal, the diff command can compare directories.
This utility is also available in most Linux distributions.

diff -rq directory1/ directory2/

-r indicates recurse through subdirectories, and -q gives brief output (i.e. don't show the actual diffs, just note what files/dirs are different).

Other useful options are:
-s report identical files,
-i ignore case in file contents,
--ignore-file-name-case ignore case when comparing file names.

If you want to avoid warnings (mostly usefulness warnings) about differences in the .DS_Store files, then use:

diff -rq directory1/ directory2/ | grep -v .DS_Store
15

Diffmerge should meet all your requirements.

  • I just hope that they will make an installer that will be able to install the command line starters and improve the current install experience. – sorin Mar 16 '11 at 17:24
  • 2
    This is an old topic - but I installed it via brew cask install diffmerge and it installed without problems. – Rainer Oct 16 '15 at 7:17
  • Apr 2016: It is still maintained, and still one of my go-to development tools. – JRobert Apr 14 '16 at 13:16
4

I recently purchased a copy of Kaleidoscope (approx $40 US). It's a clean app.

vimdiff is also available via the commandline and is portable across most UNIXy domains.

  • I've been using Kaleidoscope for a few months now. Worth the price. It goes on sale occasionally. – Ian C. Mar 15 '11 at 13:49
  • Kaleidoscope does not allow you to edit a file, useless! – mathieug Jan 26 '17 at 9:17
2

The diff tool that comes with Bare Bones Software's Text Wrangler has directory comparison, although it only shows which files are in both directories, and which are only in each of the directories. When you select a file that's in both you can edit by merging changes line by line with the click of a button. It doesn't let you move files though. You have to do this externally (eg via Finder).
I find it to be one of the better free options.

2

Easiest solution: Sync the files using Dropbox or similar, then just use WinMerge on Windows.

The FileMerge utility that ships with Xcode doesn't compare folders and doesn't do merge/editing.

2

Another neat tool to achieve this is rsync, as described on Unix & Linux StackExchange. To compare two folders you can do

rsync -avun $SOURCE $TARGET

And if you are really concerned about file consistency / bit rot there is also the c option to compare file checksums

rsync -avnc $SOURCE $TARGET
  • Great reference for its usefulness on all Unixes 🙏🏻. – dan Jan 2 at 13:23
1

I use Folder Sync It costs $8.99 on the Mac App Store It works really nicely.

You must log in to answer this question.

Not the answer you're looking for? Browse other questions tagged .