Variable: smerge-resolve-function

smerge-resolve-function is a variable defined in smerge-mode.el.gz.

Value

#[0 "\300\301!\207" [user-error "Don't know how to resolve"] 2]

Documentation

Mode-specific merge function.

The function is called with zero or one argument (non-nil if the resolution function should only apply safe heuristics) and with the match data set according to smerge-match-conflict.

Source Code

;; Defined in /usr/src/emacs/lisp/vc/smerge-mode.el.gz
(defvar smerge-resolve-function
  (lambda () (user-error "Don't know how to resolve"))
  "Mode-specific merge function.
The function is called with zero or one argument (non-nil if the resolution
function should only apply safe heuristics) and with the match data set
according to `smerge-match-conflict'.")