Function: majutsu-ediff

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

Signature

(majutsu-ediff)

Documentation

Show differences using Ediff.

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 "majutsu-ediff" nil t)
(transient-define-prefix majutsu-ediff ()
  "Show differences using Ediff."
  :class 'majutsu-jj-transient-prefix
  :jj-command "diff"
  :incompatible '(("--revisions=" "--from=")
                  ("--revisions=" "--to="))
  :transient-non-suffix t
  :description "Ediff"
  [["Selection"
    (majutsu-ediff:-r)
    (majutsu-ediff:--from)
    (majutsu-ediff:--to)
    ("c" "Clear selections" majutsu-selection-clear :transient t)]
   ["Actions"
    ("e" "Ediff (blob)" majutsu-ediff-dwim)
    ("E" "Ediff (diffedit)" majutsu-ediff-edit)]
   ["Resolve"
    ("m" "Resolve (ediff)" majutsu-ediff-resolve)
    ("M" "Resolve (conflict)" majutsu-ediff-resolve-with-conflict)]]
  (interactive)
  (transient-setup
   'majutsu-ediff nil nil
   :scope (majutsu-selection-session-begin)
   :value (majutsu-ediff--default-args)))