Kaleidoscope — File comparison for MacSpot the differences in text and image files, or even folders full of files. Review changes in seconds, with the world's most powerful file comparison and merge app. Kaleidoscope 4.2 adds relevant context when resolving a merge conflict from Git, making it easier to maintain your sanity while working on tricky merges. Always clearly see what you are merging and which commits lead to the conflict.
