Variable: vc-resolve-conflicts

vc-resolve-conflicts is a customizable variable defined in vc-hooks.el.gz.

Value

t

Documentation

Whether to mark conflicted file as resolved upon saving.

If this is non-nil and there are no more conflict markers in the file, VC will mark the conflicts in the saved file as resolved. This is only meaningful for VCS that handle conflicts by inserting conflict markers in a conflicted file.

When saving a conflicted file, VC first tries to use the value of vc-BACKEND-resolve-conflicts, for handling backend-specific settings. It defaults to this option if that option has the special value default.

This variable was added, or its default value changed, in Emacs 31.1.

Probably introduced at or before Emacs version 20.3.

Key Bindings

Source Code

;; Defined in /usr/src/emacs/lisp/vc/vc-hooks.el.gz
(defcustom vc-resolve-conflicts t
  "Whether to mark conflicted file as resolved upon saving.

If this is non-nil and there are no more conflict markers in the file,
VC will mark the conflicts in the saved file as resolved.  This is
only meaningful for VCS that handle conflicts by inserting conflict
markers in a conflicted file.

When saving a conflicted file, VC first tries to use the value
of `vc-BACKEND-resolve-conflicts', for handling backend-specific
settings.  It defaults to this option if that option has the special
value `default'."
  :type 'boolean
  :version "31.1")