From 9aae50bc5cf8e54e70831efe0272f7cfe115acf8 Mon Sep 17 00:00:00 2001 From: Thomas von Dein Date: Wed, 19 Aug 2026 23:48:26 +0200 Subject: [PATCH] update smerge hydra --- lisp/init-ediff.el | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/lisp/init-ediff.el b/lisp/init-ediff.el index 3b5d791..2046a0e 100644 --- a/lisp/init-ediff.el +++ b/lisp/init-ediff.el @@ -48,10 +48,10 @@ " ^Smerge Mode^ ^^-------------------------------------------------------------- -_n_: next conflict _u_: keep upper _s_: swap -_p_: revious conflict _l_: keep lower _h_: highlight -_e_: Ediff _b_: keep base _r_: resolve -_q_: quit _c_: keep hunk@point _R_: revert +_n_: next conflict _u_: keep upper _s_: swap +_p_: revious conflict _l_: keep lower _h_: highlight +_e_: Ediff _b_: keep base _r_: resolve +_q_: quit _RET_: keep hunk@point _R_: revert ^^-------------------------------------------------------------- Reach this hydra with @@ -64,12 +64,11 @@ Reach this hydra with ("u" smerge-keep-upper nil) ("l" smerge-keep-lower nil) ("b" smerge-keep-base nil) - ("c" smerge-keep-current nil) + ("RET" smerge-keep-current nil) ("h" smerge-refine nil) ("s" smerge-swap nil) ("r" smerge-resolve nil) ("R" undo-tree-undo nil) - ("?" smerge-popup-context-menu nil) ("e" smerge-ediff nil :color blue) ("q" nil nil :color blue))