Function: majutsu-ediff--build-resolve-args

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

Signature

(majutsu-ediff--build-resolve-args REV FILE MERGE-EDITOR-CONFIG)

Documentation

Build jj resolve arguments for REV and FILE.

MERGE-EDITOR-CONFIG is a TOML config string or list of config strings.

Source Code

;; Defined in /nix/store/jagqw3nms546pad0gxi5f3wsckk6pji7-emacs-packages-deps/share/emacs/site-lisp/majutsu-ediff.el
(defun majutsu-ediff--build-resolve-args (rev file merge-editor-config)
  "Build `jj resolve' arguments for REV and FILE.
MERGE-EDITOR-CONFIG is a TOML config string or list of config strings."
  (let ((configs (if (listp merge-editor-config)
                     merge-editor-config
                   (list merge-editor-config))))
    (majutsu-jj-append-filesets
     (append
      (list "resolve")
      (apply #'append
             (mapcar (lambda (config)
                       (list "--config" config))
                     configs))
      (list "-r" (or rev "@")))
     (and file (list file)))))