summaryrefslogtreecommitdiff
path: root/.config/emacs
diff options
context:
space:
mode:
Diffstat (limited to '.config/emacs')
-rw-r--r--.config/emacs/init.el7
1 files changed, 7 insertions, 0 deletions
diff --git a/.config/emacs/init.el b/.config/emacs/init.el
index b907141..da3ef05 100644
--- a/.config/emacs/init.el
+++ b/.config/emacs/init.el
@@ -229,3 +229,10 @@
(when (fboundp 'imagemagick-register-types)
(imagemagick-register-types))
+
+(defun sm-try-smerge ()
+ (save-excursion
+ (goto-char (point-min))
+ (when (re-search-forward "^<<<<<<< " nil t)
+ (smerge-mode 1))))
+(add-hook 'find-file-hook 'sm-try-smerge t)