On Sun, 2006-08-13 at 16:33 +0200, Adrian Aichner wrote: It's currently aliased to smerge-ediff, which we don't have. This area needs some work; either smerge-mode.el needs to be brought in from GNU Emacs or the implementation for related bits done some other way, eg. by forward porting stuff from the old vc.el. I don't use this functionality so help is welcome, but I'll eventually do something about it unless someone beats me to it.

On Wed, 2006-08-16 at 12:23 +0900, stephen(a)xemacs.org wrote: Ok, committed to unsupported/scop/vc with some very minimal initial porting changes. It compiles, but is more than a little broken at the moment, at least: - Uses overlays quite a bit, including some things that are not in our fsf-compat/overlay.el - Other undefined functions used include additionally at least posn-set-point, event-end, atomic-change-group, font-lock-add-keywords, font-lock-remove-keywords - Faces don't seem to work