Variable: magit-ediff-dwim-resolve-function

magit-ediff-dwim-resolve-function is a customizable variable defined in magit-ediff.el.

Value

magit-ediff-resolve-rest

Documentation

The function magit-ediff-dwim uses to resolve conflicts.

This variable was added, or its default value changed, in magit version 4.0.0.

Source Code

;; Defined in ~/.emacs.d/elpa/magit-20260411.1452/magit-ediff.el
(defcustom magit-ediff-dwim-resolve-function #'magit-ediff-resolve-rest
  "The function `magit-ediff-dwim' uses to resolve conflicts."
  :package-version '(magit . "4.0.0")
  :group 'magit-ediff
  :type '(choice (const magit-ediff-resolve-rest)
                 (const magit-ediff-resolve-all)
                 (const magit-git-mergetool)))