Kaleidoscope

Hands down the best file comparison and merge tool for Mac