> Thanks. What are some other third party tools for this? Hi Scott - there's a bit of discussion here that you might find of interest: http://blog.macromates.com/2008/changes-filemerge-replacement/ I use Araxis Merge (http://www.araxis.com/merge_mac/index.html), which does the job (very) nicely. Expensive, but worth it.