diff options
Diffstat (limited to 'user/emacs')
| -rw-r--r-- | user/emacs/init.el | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/user/emacs/init.el b/user/emacs/init.el index 8dd7831c..1722d392 100644 --- a/user/emacs/init.el +++ b/user/emacs/init.el @@ -288,15 +288,15 @@ With two prefix arguments, write out the day and month name." (:color pink :hint nil :post (smerge-auto-leave)) " ^Move^ ^Keep^ ^Diff^ ^Other^ -^^-----------^^-------------------^^---------------------^^------- -_n_ext _b_ase _<_: upper/base _C_ombine -_p_rev _u_pper _=_: upper/lower _r_esolve +^^-----------^^-------------------^^---------------------^^------------- +_C-j_: next _b_ase _<_: upper/base _C_ombine +_C-k_: prev _u_pper _=_: upper/lower _s_mart resolve ^^ _l_ower _>_: base/lower _k_ill current -^^ _a_ll _R_efine +^^ _a_ll _R_efine (words) ^^ _RET_: current _E_diff " - ("n" smerge-next) - ("p" smerge-prev) + ("C-j" smerge-next) + ("C-k" smerge-prev) ("b" smerge-keep-base) ("u" smerge-keep-upper) ("l" smerge-keep-lower) @@ -309,7 +309,7 @@ _p_rev _u_pper _=_: upper/lower _r_esolve ("R" smerge-refine) ("E" smerge-ediff) ("C" smerge-combine-with-next) - ("r" smerge-resolve) + ("s" smerge-resolve) ("k" smerge-kill-current) ("w" (lambda () (interactive) |