Kaleidoscope, the popular file comparison and merge tool, recently released an update with significant improvements to its merge conflict resolution tools. The new version introduces new features and ...