From b8096342f8b51728d29295724b00abd742a88e98 Mon Sep 17 00:00:00 2001 From: jgart <47760695+jgarte@users.noreply.github.com> Date: Sat, 6 Aug 2022 06:39:54 -0500 Subject: [PATCH] smerge: Add README.org to describe keybindings --- modes/smerge/README.org | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 modes/smerge/README.org diff --git a/modes/smerge/README.org b/modes/smerge/README.org new file mode 100644 index 0000000..356bec7 --- /dev/null +++ b/modes/smerge/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= |