I've found another pre-bundled tool in the Mac arsenal, Filemerge. FileMerge is a utility for patch and diff commands from an oh-so-simple graphical interface. You can review and save changes to any type of text file, not only that you can compare folders which is great for merging photo and music. It comes free (with Xcode) and you should be able to find it in /Developer/Applications/Utilities/