diff options
| author | Jack Jamison <jackqjamison@gmail.com> | 2026-07-05 01:19:30 -0400 |
|---|---|---|
| committer | Jack Jamison <jackqjamison@gmail.com> | 2026-07-05 01:19:30 -0400 |
| commit | bdf9a71ab7baa2b1de9abcfd5df1a9107a55d141 (patch) | |
| tree | c4524e6c41aa5107211103401dabfaefc81aa882 /.config/emacs/lisp/evil-collection/modes/smerge-mode/README.org | |
| parent | fe3984f541bd32bdfa418afb305b614176b55ca0 (diff) | |
add a bunch of emacs packages HELP
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, 16 insertions, 0 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 new file mode 100644 index 0000000..44871a7 --- /dev/null +++ b/.config/emacs/lisp/evil-collection/modes/smerge-mode/README.org @@ -0,0 +1,16 @@ +* 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= | |
