Function: vc-resolve-conflicts
vc-resolve-conflicts is a function alias and interactive for
smerge-ediff, defined in smerge-mode.el.gz.
Signature
(vc-resolve-conflicts &optional NAME-UPPER NAME-LOWER NAME-BASE)
Documentation
Invoke ediff to resolve the conflicts.
NAME-UPPER, NAME-LOWER, and NAME-BASE, if non-nil, are used for the buffer names.
Probably introduced at or before Emacs version 20.3.
Key Bindings