scip/dot-emacs
1
0
Fork 0
mirror of https://codeberg.org/scip/dot-emacs.git synced 2026-08-24 05:34:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

update smerge hydra

Browse Source
This commit is contained in:
Thomas von Dein
2026-08-19 23:48:26 +02:00
parent 9659ad8b58
commit 9aae50bc5c
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lisp/init-ediff.el
View File

@@ -48,10 +48,10 @@
" "
^Smerge Mode^ ^Smerge Mode^
^^-------------------------------------------------------------- ^^--------------------------------------------------------------
_n_: next conflict _u_: keep upper _s_: swap _n_: next conflict _u_: keep upper _s_: swap
_p_: revious conflict _l_: keep lower _h_: highlight _p_: revious conflict _l_: keep lower _h_: highlight
_e_: Ediff _b_: keep base _r_: resolve _e_: Ediff _b_: keep base _r_: resolve
_q_: quit _c_: keep hunk@point _R_: revert _q_: quit _RET_: keep hunk@point _R_: revert
^^-------------------------------------------------------------- ^^--------------------------------------------------------------
Reach this hydra with <C-x m> Reach this hydra with <C-x m>
@@ -64,12 +64,11 @@ Reach this hydra with <C-x m>
("u" smerge-keep-upper nil) ("u" smerge-keep-upper nil)
("l" smerge-keep-lower nil) ("l" smerge-keep-lower nil)
("b" smerge-keep-base nil) ("b" smerge-keep-base nil)
("c" smerge-keep-current nil) ("RET" smerge-keep-current nil)
("h" smerge-refine nil) ("h" smerge-refine nil)
("s" smerge-swap nil) ("s" smerge-swap nil)
("r" smerge-resolve nil) ("r" smerge-resolve nil)
("R" undo-tree-undo nil) ("R" undo-tree-undo nil)
("?" smerge-popup-context-menu nil)
("e" smerge-ediff nil :color blue) ("e" smerge-ediff nil :color blue)
("q" nil nil :color blue)) ("q" nil nil :color blue))