Black Pixel has been getting a lot of airtime recently, especially after one of Apple’s Developer Relations people decided to head over and join them.
Well, I have picked up one of their apps this past week, Kaleidoscope, to help me when working with merges. It is billed as a file comparison app for the Mac, but it can also take a look at changes in whole folders, help you view the visual changes in an image, and look at text files. It integrates with Git and many 3rd party apps and I have liked it so far.
It is available on the Mac App Store (you’ll find the link on their site), but you will have to pay for it. Otherwise, if you want to try, you can find a 15-day trial on their site as well. Why not give it a shot?