mirror of
https://codeberg.org/scip/dot-emacs.git
synced 2026-11-22 14:18:58 +01:00
enhance smerge hydra
This commit is contained in:
@@ -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 <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)
|
||||
("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))
|
||||
|
||||
Reference in New Issue
Block a user