2 ms·Casual Ediff2 points by kickingvegas 11mo agokickingvegas 11mo agoAnnouncing Casual Ediff, with enhancements to support viewing changes to a version-controlled file and to resolve merge conflicts from Emacs.