summaryrefslogtreecommitdiff
path: root/emacs/.config/emacs-kj/lisp/kj-bindings.el
diff options
context:
space:
mode:
Diffstat (limited to 'emacs/.config/emacs-kj/lisp/kj-bindings.el')
-rw-r--r--emacs/.config/emacs-kj/lisp/kj-bindings.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/emacs/.config/emacs-kj/lisp/kj-bindings.el b/emacs/.config/emacs-kj/lisp/kj-bindings.el
index 11a45f3..b60db7a 100644
--- a/emacs/.config/emacs-kj/lisp/kj-bindings.el
+++ b/emacs/.config/emacs-kj/lisp/kj-bindings.el
@@ -6,7 +6,7 @@
("C-c s" . kj/shell-here)
("C-c t" . eshell)
("M-o" . other-window)
- ("C-c m" . smerge-ediff)
+ ("C-c M" . smerge-ediff)
("C-c b r" . revert-buffer)
("C-c r l" . consult-flymake)
("C-c r f" . eglot-format)