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

automatically fire smerge hydra in conflict buffers

Browse Source
This commit is contained in:
Thomas von Dein
2026-08-19 23:43:55 +02:00
parent 1ce0a66378
commit 9659ad8b58
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lisp/init-magit.el
View File

@@ -15,6 +15,13 @@
;; the hassle to go to status before just committing etc. So: ;; the hassle to go to status before just committing etc. So:
(("C-c g" . magit-file-dispatch)) (("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 :config
(magit-todos-mode) (magit-todos-mode)