Function: majutsu-ediff--resolve-file-dwim

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

Signature

(majutsu-ediff--resolve-file-dwim &optional FILE)

Documentation

Return conflicted FILE for resolve workflow.

If FILE is nil and point is on a commit section, prompt conflicts in that revision; otherwise prompt from working copy conflicts.

Source Code

;; Defined in /nix/store/jagqw3nms546pad0gxi5f3wsckk6pji7-emacs-packages-deps/share/emacs/site-lisp/majutsu-ediff.el
(defun majutsu-ediff--resolve-file-dwim (&optional file)
  "Return conflicted FILE for resolve workflow.
If FILE is nil and point is on a commit section, prompt conflicts in that
revision; otherwise prompt from working copy conflicts."
  (or file
      (majutsu-ediff--read-conflicted-file
       (majutsu-revision-at-point))))