diff --git a/lisp/init-smerge.el b/lisp/init-smerge.el index e458454..fd9437d 100644 --- a/lisp/init-smerge.el +++ b/lisp/init-smerge.el @@ -12,8 +12,8 @@ " ^Smerge Mode^ ^^-------------------------------------------------------------- -_n_: next conflict _u_: keep upper _s_: swap -_p_: prev conflict _l_: keep lower _h_: highlight +_n_: next conflict _t_: keep theirs _s_: swap +_p_: prev conflict _o_: keep ours _h_: highlight _e_: Ediff _b_: keep base _r_: resolve _q_: quit _RET_: keep hunk@point _R_: revert @@ -23,18 +23,18 @@ Reach this hydra with " - ("n" smerge-next nil) - ("p" smerge-prev nil) - ("u" smerge-keep-upper nil) - ("l" smerge-keep-lower nil) - ("b" smerge-keep-base nil) - ("RET" smerge-keep-current nil) - ("h" smerge-refine nil) - ("s" smerge-swap nil) - ("r" smerge-resolve nil) - ("R" undo-tree-undo nil) - ("e" smerge-ediff nil :color blue) - ("q" nil nil :color blue)) + ("n" smerge-next nil) + ("p" smerge-prev nil) + ("t" smerge-keep-upper nil) + ("o" smerge-keep-lower nil) + ("b" smerge-keep-base nil) + ("RET" smerge-keep-current nil) + ("h" smerge-refine nil) + ("s" smerge-swap nil) + ("r" smerge-resolve nil) + ("R" undo-tree-undo nil) + ("e" smerge-ediff nil :color blue) + ("q" nil nil :color blue)) (global-set-key (kbd "C-x m") 'hydra-smerge/body) (defalias 'merge 'hydra-smerge/body))