From 6afcb92b69ed3710480186e73b8b7e18db21ccc2 Mon Sep 17 00:00:00 2001
From: Blake Romero <blake@blkrom.com>
Date: Wed, 9 Jul 2025 21:05:32 +0100
Subject: Rebind diff-mode's M-o keybinding to fix conflict

---
 emacs-config.org | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/emacs-config.org b/emacs-config.org
index f0964bc..b20fa34 100644
--- a/emacs-config.org
+++ b/emacs-config.org
@@ -142,3 +142,10 @@ Help actions.
   (keymap-global-set "C-h M" #'describe-keymap)
   (keymap-global-set "C-h j" #'describe-char)
 #+end_src
+* Version Control
+Rebind diff-mode's ~diff-goto-source~ keybinding due to conflict with =M-o=.
+#+begin_src elisp
+  (with-eval-after-load 'diff-mode
+    (keymap-set diff-mode-map "M-o" #'other-window)
+    (keymap-set diff-mode-map "M-j" #'diff-goto-source))
+#+end_src
-- 
cgit