The folks over at Black Pixel have just released Kaleidoscope 2.
Use Kaleidoscope to spot the differences in text, images, and folders. Review and merge changes in seconds with the worldâ€™s most advanced file comparison application.
I regularly use Kaleidoscope in my workflow for diffing images, text and files. If you do QA, development or design, you need this app. Go check it out.
Full Disclosure: I have a large bias toward the people at Black Pixel because they’re awesome.