vc-resolve-conflicts

vc-resolve-conflicts is an alias for `smerge-ediff' in `vc.el'.


(vc-resolve-conflicts &optional NAME-MINE NAME-OTHER NAME-BASE)

Invoke ediff to resolve the conflicts.
NAME-MINE, NAME-OTHER, and NAME-BASE, if non-nil, are used for the
buffer names.