smerge-resolve

smerge-resolve is an interactive compiled Lisp function in `smerge-mode.el'.


(smerge-resolve &optional SAFE)

Resolve the conflict at point intelligently.
This relies on mode-specific knowledge and thus only works in some
major modes. Uses `smerge-resolve-function' to do the actual work.