diff options
| author | Justin Burkett <justin@burkett.cc> | 2018-07-13 07:01:44 -0400 |
|---|---|---|
| committer | James N <james@jojojames.com> | 2019-10-09 19:41:45 -0700 |
| commit | 9346e4452bb1b62bf5825ca6b3c01abd80d33813 (patch) | |
| tree | e72130f393fae9a175a68eef6c189f2ac991162e /modes/ediff | |
| parent | 95dad4c734ae3d3811c05b259eea15ac4f3cb5c5 (diff) | |
ediff: Add a README
Diffstat (limited to 'modes/ediff')
| -rw-r--r-- | modes/ediff/README.org | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/modes/ediff/README.org b/modes/ediff/README.org new file mode 100644 index 0000000..6aa4b6f --- /dev/null +++ b/modes/ediff/README.org @@ -0,0 +1,21 @@ +* ediff + + The table below shows the binding changes that are made to ediff-mode. + +| Command | Original Binding | evil-collection-ediff | +|-----------------------------+------------------+-----------------------| +| =ediff-next-difference= | =n, SPC= | =j, n, SPC= | +| =ediff-previous-difference= | =p, DEL= | =k, N, p, DEL= | +| =ediff-jump-to-difference= | =j= | =d= | +| jump to first difference | =1j= | =gg, 1d= | +| jump to last difference | N/A | =G= | +| copy region A to region B | =a= | =a, l= | +| copy region B to region A | =b= | =b, h= | +| scroll down 1 line | =C-u 1 v= | =C-e= | +| scroll up 1 line | =C-u 1 V= | =C-y= | +| scroll down half page | =v, C-v= | =C-d, v, C-v= | +| scroll up half page | =V, M-v= | =C-u, V, M-v= | +| scroll left | =>= | =zh= | +| scroll right | =<= | =zl= | +| toggle highlighting | =h= | =H= | +| =ediff-suspend= | =z= | =C-z= | |