Function: majutsu-ediff-resolve-with-conflict

majutsu-ediff-resolve-with-conflict is an interactive and natively compiled function defined in majutsu-ediff.el.

Signature

(majutsu-ediff-resolve-with-conflict)

Documentation

Resolve conflicts using majutsu-conflict-mode(var)/majutsu-conflict-mode(fun).

When resolving a non-working-copy revision, open the matching blob buffer at that revision before enabling conflict mode.

Key Bindings

This command is not in any keymaps.

Source Code

;; Defined in /nix/store/jagqw3nms546pad0gxi5f3wsckk6pji7-emacs-packages-deps/share/emacs/site-lisp/majutsu-ediff.el
;;;###autoload(autoload 'majutsu-ediff-resolve-with-conflict "majutsu-ediff" nil t)
(transient-define-suffix majutsu-ediff-resolve-with-conflict ()
  "Resolve conflicts using `majutsu-conflict-mode'.
When resolving a non-working-copy revision, open the matching blob buffer
at that revision before enabling conflict mode."
  :advice* #'majutsu--transient-with-selection-buffer
  (interactive)
  (let* ((rev (or (majutsu-revision-at-point) "@"))
         (file (majutsu-ediff--resolve-file-dwim))
         (buffer (majutsu-ediff--resolve-target-buffer rev file)))
    (pop-to-buffer buffer)
    (with-current-buffer buffer
      (majutsu-conflict-ensure-mode)
      (majutsu-conflict-goto-nearest))))