File: magit-ediff.el.html
This library provides basic support for Ediff.
Defined variables (5)
magit-ediff-dwim-resolve-function | The function ‘magit-ediff-dwim’ uses to resolve conflicts. |
magit-ediff-dwim-show-on-hunks | Whether ‘magit-ediff-dwim’ runs show variants on hunks. |
magit-ediff-quit-hook | Hooks to run after finishing Ediff, when that was invoked using Magit. |
magit-ediff-show-stash-with-index | Whether ‘magit-ediff-show-stash’ shows the state of the index. |
magit-ediff-use-indirect-buffers | Whether to use indirect buffers. |
Defined functions (16)
magit-ediff | () |
magit-ediff--bury-buffer | (BUFFER) |
magit-ediff--find-file | (REV FILE) |
magit-ediff-buffers | (A B &optional C SETUP QUIT FILE) |
magit-ediff-compare | (ARG1 ARG2 ARG3 ARG4) |
magit-ediff-compare--read-revisions | (&optional ARG MBASE) |
magit-ediff-dwim | () |
magit-ediff-read-files | (REVA REVB &optional FILEB) |
magit-ediff-resolve-all | (ARG1) |
magit-ediff-resolve-rest | (ARG1) |
magit-ediff-show-commit | (ARG1) |
magit-ediff-show-staged | (ARG1) |
magit-ediff-show-stash | (ARG1) |
magit-ediff-show-unstaged | (ARG1) |
magit-ediff-show-working-tree | (ARG1) |
magit-ediff-stage | (ARG1) |