wow thanks @timeril FileMerge (part of Apple's Xcode package?) is a pretty sweet diff utility. Command + Down arrow goto next diff. :)