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

fine tune smerge hydra

Browse Source
This commit is contained in:
Thomas von Dein
2026-08-19 23:25:03 +02:00
parent f246281bc4
commit 301d837851
1 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
lisp/init-ediff.el
View File

@@ -44,20 +44,35 @@
;; prefix. So just a hydra will do.
(when (fboundp 'defhydra)
(defhydra hydra-smerge (:color blue :timeout 30.0)
(defhydra hydra-smerge (:timeout 30.0 :exit nil)
"
^Smerge Mode^
^^-------------------------------------------------------
_n_ext conflict keep _u_pper m_e_rge conflicts in Ediff
_p_revious conflict keep _l_ower _q_uit"
^^--------------------------------------------------------------
_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 _?_: menu
("n" smerge-next nil :exit nil)
("p" smerge-prev nil :exit nil)
("u" smerge-keep-upper nil :exit nil)
("l" smerge-keep-lower nil :exit nil)
("e" smerge-ediff nil :color red)
("q" nil nil :color red))
^^--------------------------------------------------------------
Reach this hydra with <C-x m>
^^--------------------------------------------------------------
"
("n" smerge-next nil)
("p" smerge-prev nil)
("u" smerge-keep-upper nil)
("l" smerge-keep-lower nil)
("b" smerge-keep-base nil)
("c" smerge-keep-current nil)
("h" smerge-refine nil)
("s" smerge-swap nil)
("r" smerge-resolve nil)
("?" smerge-popup-context-menu 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))