Gary Rosenzweig takes a look at three methods of merging files inside of folders. You can use Apple's FileMerge that comes with XCode, the "ditto" command in Terminal or a variety of downloadable programs including File Synchronization.