diff --git a/init.el b/init.el index f349ac8..8fb5150 100644 --- a/init.el +++ b/init.el @@ -142,6 +142,14 @@ (use-package simple :config (column-number-mode)) +(use-package smerge-mode + :defer t + :config + (when (>= emacs-major-version 27) + (set-face-attribute 'smerge-refined-changed nil :extend t) + (set-face-attribute 'smerge-refined-removed nil :extend t) + (set-face-attribute 'smerge-refined-added nil :extend t))) + (progn ; `text-mode' (add-hook 'text-mode-hook #'indicate-buffer-boundaries-left))