unsupported vc-0.05 does not have vc-resolve-conflicts

[Ville Skyttä]

On Wed, 2006-08-16 at 12:23 +0900, stephen at xemacs.org wrote:
> Ville Skyttä writes:
> 
>  > 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
> 
> I think this is the best way to go.  If you have a current copy handy
> and can put it in, I'd be happy to help with beating it into shape.

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