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

[Ville Skyttä]

On Sun, 2006-08-13 at 16:33 +0200, Adrian Aichner wrote:

> Where did vc-resolve-conflicts go?

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.