Emacs is a powerful editor and it supports CVS/RCS - especially for revision merging and comparing. Emacs main site is at http://www.emacs.org.