Variable: smerge-conflict-style

smerge-conflict-style is a variable defined in smerge-mode.el.gz.

Value

nil

Documentation

Keep track of which style of conflict is in use.

Can be nil if the style is undecided, or else:
- diff3-E
- diff3-A

Source Code

;; Defined in /usr/src/emacs/lisp/vc/smerge-mode.el.gz
(defvar smerge-conflict-style nil
  "Keep track of which style of conflict is in use.
Can be nil if the style is undecided, or else:
- `diff3-E'
- `diff3-A'")