Variable: majutsu-conflict--style

majutsu-conflict--style is a buffer-local variable defined in majutsu-conflict.el.

Documentation

Current conflict style: jj-diff or jj-snapshot.

Source Code

;; Defined in /nix/store/jagqw3nms546pad0gxi5f3wsckk6pji7-emacs-packages-deps/share/emacs/site-lisp/majutsu-conflict.el
(defvar-local majutsu-conflict--style nil
  "Current conflict style: `jj-diff' or `jj-snapshot'.")