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

[stephen at xemacs.org]

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.

Steve