File comparison app Kaleidoscope updated with new merge conflict resolution tools
Kaleidoscope, the popular file comparison and merge tool, recently released an update with significant improvements to its ...