Function: majutsu-conflict-keep-side

majutsu-conflict-keep-side is an interactive and natively compiled function defined in majutsu-conflict.el.

Signature

(majutsu-conflict-keep-side N &optional BEFORE)

Documentation

Keep side N (1-indexed) of the conflict at point.

With prefix arg (BEFORE non-nil), keep remove term N. Without prefix, keep add term N (jj side #N).

Key Bindings

This command is not in any keymaps.

Source Code

;; Defined in /nix/store/jagqw3nms546pad0gxi5f3wsckk6pji7-emacs-packages-deps/share/emacs/site-lisp/majutsu-conflict.el
(defun majutsu-conflict-keep-side (n &optional before)
  "Keep side N (1-indexed) of the conflict at point.
With prefix arg (BEFORE non-nil), keep remove term N.
Without prefix, keep add term N (jj side #N)."
  (interactive "p\nP")
  (let ((conflict (majutsu-conflict-at-point)))
    (unless conflict
      (user-error "No conflict at point"))
    (let* ((adds (majutsu-conflict-adds conflict))
           (removes (majutsu-conflict-removes conflict))
           (content (if before
                        (cdr (nth (1- n) removes))
                      (cdr (nth (1- n) adds)))))
      (unless content
        (user-error "No side %d%s" n (if before " (before)" "")))
      (majutsu-conflict-resolve-with conflict content))))