Variable: majutsu-conflict-mode-map

majutsu-conflict-mode-map is a variable defined in majutsu-conflict.el.

Value

C-c ^ 1    #<anonymous-function>
C-c ^ 2    #<anonymous-function>
C-c ^ 3    #<anonymous-function>
C-c ^ 4    #<anonymous-function>
C-c ^ 5    #<anonymous-function>
C-c ^ 6    #<anonymous-function>
C-c ^ 7    #<anonymous-function>
C-c ^ 8    #<anonymous-function>
C-c ^ 9    #<anonymous-function>
C-c ^ M-1  #<anonymous-function>
C-c ^ M-2  #<anonymous-function>
C-c ^ M-3  #<anonymous-function>
C-c ^ M-4  #<anonymous-function>
C-c ^ M-5  #<anonymous-function>
C-c ^ M-6  #<anonymous-function>
C-c ^ M-7  #<anonymous-function>
C-c ^ M-8  #<anonymous-function>
C-c ^ M-9  #<anonymous-function>
C-c ^ R    majutsu-conflict-refine
C-c ^ b    majutsu-conflict-keep-base
C-c ^ n    majutsu-conflict-next
C-c ^ p    majutsu-conflict-prev

Documentation

Keymap for majutsu-conflict-mode(var)/majutsu-conflict-mode(fun).

C-c ^ n (majutsu-conflict-next) - next conflict C-c ^ p (majutsu-conflict-prev) - previous conflict C-c ^ b (majutsu-conflict-keep-base) - keep base (rebase destination) C-c ^ R (majutsu-conflict-refine) - add word-level refinement C-c ^ 1-9 - keep side N (after diff) C-c ^ M-1 to M-9 - keep side N (before diff)

Source Code

;; Defined in /nix/store/jagqw3nms546pad0gxi5f3wsckk6pji7-emacs-packages-deps/share/emacs/site-lisp/majutsu-conflict.el
(defvar-keymap majutsu-conflict-mode-map
  :doc "Keymap for `majutsu-conflict-mode'.
\\<majutsu-conflict-mode-map>
\\[majutsu-conflict-next] - next conflict
\\[majutsu-conflict-prev] - previous conflict
\\[majutsu-conflict-keep-base] - keep base (rebase destination)
\\[majutsu-conflict-refine] - add word-level refinement
C-c ^ 1-9 - keep side N (after diff)
C-c ^ M-1 to M-9 - keep side N (before diff)"
  "C-c ^ n" #'majutsu-conflict-next
  "C-c ^ p" #'majutsu-conflict-prev
  "C-c ^ b" #'majutsu-conflict-keep-base
  "C-c ^ R" #'majutsu-conflict-refine)