File comparison app Kaleidoscope updated with new merge conflict resolution tools


Trending Today on MacHash