Announcing Casual Ediff, with enhancements to support viewing changes to a version-controlled file and to resolve merge conflicts from Emacs.