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

add undo, rm popup

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

3
lisp/init-ediff.el
View File

@@ -51,7 +51,7 @@
_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 _?_: menu _q_: quit _c_: keep hunk@point _R_: revert
^^-------------------------------------------------------------- ^^--------------------------------------------------------------
Reach this hydra with <C-x m> Reach this hydra with <C-x m>
@@ -68,6 +68,7 @@ Reach this hydra with <C-x m>
("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)
("?" smerge-popup-context-menu 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))