Variable: majutsu-conflict-diff-re

majutsu-conflict-diff-re is a variable defined in majutsu-conflict.el.

Value

"^\\(%\\{7,\\}\\)\\(?: \\(.*\\)\\)?$"

Documentation

Regexp matching diff marker in JJ-style.

Source Code

;; Defined in /nix/store/jagqw3nms546pad0gxi5f3wsckk6pji7-emacs-packages-deps/share/emacs/site-lisp/majutsu-conflict.el
(defconst majutsu-conflict-diff-re
  "^\\(%\\{7,\\}\\)\\(?: \\(.*\\)\\)?$"
  "Regexp matching diff marker in JJ-style.")