From bdf9a71ab7baa2b1de9abcfd5df1a9107a55d141 Mon Sep 17 00:00:00 2001 From: Jack Jamison Date: Sun, 5 Jul 2026 01:19:30 -0400 Subject: add a bunch of emacs packages HELP --- .../lisp/evil-collection/modes/smerge-mode/README.org | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 .config/emacs/lisp/evil-collection/modes/smerge-mode/README.org (limited to '.config/emacs/lisp/evil-collection/modes/smerge-mode/README.org') 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= | -- cgit v1.2.3