Function: majutsu-ediff--run-resolve

majutsu-ediff--run-resolve is a natively compiled function defined in majutsu-ediff.el.

Signature

(majutsu-ediff--run-resolve REV FILE)

Documentation

Run `jj resolve` for REV and FILE with Majutsu Ediff config.

Source Code

;; Defined in /nix/store/jagqw3nms546pad0gxi5f3wsckk6pji7-emacs-packages-deps/share/emacs/site-lisp/majutsu-ediff.el
(defun majutsu-ediff--run-resolve (rev file)
  "Run `jj resolve` for REV and FILE with Majutsu Ediff config."
  (let* ((merge-editor-cmd
          (majutsu-ediff--merge-editor-config))
         (args (majutsu-ediff--build-resolve-args rev file merge-editor-cmd)))
    ;; Use async to avoid blocking Emacs while jj waits for merge completion.
    (apply #'majutsu-run-jj-async args)))