diff options
Diffstat (limited to '.config/emacs/lisp/evil-collection/modes/vdiff/README.org')
| -rw-r--r-- | .config/emacs/lisp/evil-collection/modes/vdiff/README.org | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/.config/emacs/lisp/evil-collection/modes/vdiff/README.org b/.config/emacs/lisp/evil-collection/modes/vdiff/README.org new file mode 100644 index 0000000..3ba3adf --- /dev/null +++ b/.config/emacs/lisp/evil-collection/modes/vdiff/README.org @@ -0,0 +1,18 @@ +* vdiff + + Evil bindings for [[https://github.com/justbur/emacs-vdiff][vdiff]], a vimdiff-style diff/merge interface. + + Applied to both =vdiff-mode-map= and =vdiff-3way-mode-map=. + +** Key bindings + + | Command | Original | Evil | + |-------------------------+----------+------| + | =vdiff-next-hunk= | (varies) | =]c= | + | =vdiff-previous-hunk= | (varies) | =[c= | + | =vdiff-receive-changes= | =do= | =do= | + | =vdiff-send-changes= | =dp= | =dp= | + + =do= / =dp= are installed as evil operator-keys via + =evil-collection-define-operator-key= so they compose with motions like + vim's =do= (diff obtain) and =dp= (diff put). |