If you don't know about it already…
As I get close to finishing my upgrade to 1.3.9a; I thought I'd recommend using FileMerge that is part of Apple's Developer's Tools (you can also install from your OS X DVD), which usually live here,:
/Developer/Applications/Utilities/FileMerge.app
Drag the folders you want to compare to the top boxes and the folder that will hold the merged files to the bottom right. You could use the ancestor box; but, it's not required.
After FileMerge initializes, it will display this screen.
Go through the files and directories, be sure to remember which is right and left, and you're one step closer!





