aboutsummaryrefslogtreecommitdiff
path: root/.config/emacs/lisp/evil-collection/modes/vdiff/README.org
blob: 3ba3adfe49d5fd054aede835dd7bb52faf269a58 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
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).