diff options
Diffstat (limited to '.config/emacs/lisp/evil-collection/modes/smerge-mode/README.org')
| -rw-r--r-- | .config/emacs/lisp/evil-collection/modes/smerge-mode/README.org | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/.config/emacs/lisp/evil-collection/modes/smerge-mode/README.org b/.config/emacs/lisp/evil-collection/modes/smerge-mode/README.org deleted file mode 100644 index 44871a7..0000000 --- a/.config/emacs/lisp/evil-collection/modes/smerge-mode/README.org +++ /dev/null @@ -1,16 +0,0 @@ -* smerge - - The table below shows the binding changes that are made to smerge-mode. - -| Command | Original Binding | evil-collection-smerge | -|----------------------------+------------------+------------------------| -| =smerge-next= | =C-c ^ n= | =gj, ]]= | -| =smerge-prev= | =C-c ^ p= | =gk, [[= | -| =smerge-keep-all= | =C-c ^ a= | =ga= | -| =smerge-keep-upper= | =C-c ^ u= | =gu= | -| =smerge-keep-lower= | =C-c ^ l= | =gl= | -| =smerge-keep-other= | =C-c ^ o= | =go= | -| =smerge-keep-mine= | =C-c ^ m= | =gm= | -| =smerge-combine-with-next= | =C-c ^ C= | =gc= | -| =smerge-refine= | =C-c ^ R= | =gr= | -| =smerge-keep-base= | =C-c ^ b= | =gb= | |