From 9659ad8b582b89031dcae0a497e74eab9d4fcfd0 Mon Sep 17 00:00:00 2001 From: Thomas von Dein Date: Wed, 19 Aug 2026 23:43:55 +0200 Subject: [PATCH] automatically fire smerge hydra in conflict buffers --- lisp/init-magit.el | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/lisp/init-magit.el b/lisp/init-magit.el index 41097bf..50df39c 100644 --- a/lisp/init-magit.el +++ b/lisp/init-magit.el @@ -15,6 +15,13 @@ ;; the hassle to go to status before just committing etc. So: (("C-c g" . magit-file-dispatch)) + :hook + + ;; automatically fire up smerge hydra when visiting a buffer + ;; containing merge conflict[s]. Hydra see init-ediff.el + (magit-diff-visit-file . (lambda () + (hydra-smerge/body))) + :config (magit-todos-mode)