mirror of
https://codeberg.org/scip/dot-emacs.git
synced 2026-08-23 21:24:18 +02:00
automatically fire smerge hydra in conflict buffers
This commit is contained in:
@@ -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)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user