Graphical diff — FileMerge

There is a great introduction to the Mac xcode utility “FileMerge” here:

http://www.macdevcenter.com/pub/a/mac/2006/05/02/filemerge.html?page=1

Basically, its a graphical interface to diff, allowing you to compare two similar files for differences and merge or ignore them.