Try installing the optional Xcode tools from your OSX install disk.
This includes a utility called FileMerge for comparing and merging
After this install you'll find it here
Keep up to date with Rails on Twitter and This Week in Rails
Policies: Conduct, License, Maintenance, Security, Trademarks