diff --git a/lisp/init-ediff.el b/lisp/init-ediff.el index 15269d2..3b5d791 100644 --- a/lisp/init-ediff.el +++ b/lisp/init-ediff.el @@ -51,7 +51,7 @@ _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 +_q_: quit _c_: keep hunk@point _R_: revert ^^-------------------------------------------------------------- Reach this hydra with @@ -68,6 +68,7 @@ Reach this hydra with ("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))