FileMerge is bundled with XCode, but I prefer Kaleidoscope app which is not free though :

http://www.kaleidoscopeapp.com/