parent
f4b68936a3
commit
228f478f99
2 changed files with 61 additions and 0 deletions
|
@ -38,6 +38,15 @@ repository root."
|
|||
(+vcs*update-header-line)
|
||||
(setq-local header-line-format nil)))
|
||||
|
||||
;;;###autoload
|
||||
(defun +vcs|enable-smerge-mode-maybe ()
|
||||
"Auto-enable `smerge-mode' when merge conflict is detected."
|
||||
(save-excursion
|
||||
(goto-char (point-min))
|
||||
(when (re-search-forward "^<<<<<<< " nil :noerror)
|
||||
(smerge-mode 1)
|
||||
(when +vcs-auto-hydra-smerge (+hydra-smerge/body)))))
|
||||
|
||||
;;;###autoload
|
||||
(defun +vcs*update-header-line (&rest _)
|
||||
"Show revision details in the header-line, instead of the minibuffer.
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue