FileMerger.app (callable from the command line) has I nice built in file tree comparer. To run:

$ opendiff project1/ project2/

This opens FileMerger with a special databrowser for comparing file trees.

Merging can be done using keyboard commands. Useful.