macobserver.com
DeltaWalker 2 Pro for Mac: $29.95 - The Mac Observer
We have a deal on DeltaWalker 2 for Mac (there's a Windows version, too). This software allows you to compare, edit and merge files side-by-side.