X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/cc8708fc32ad33d723fdc35d56f808068ea43e9b..0a030a3975ce30f3f3a701e2fd6876aef254324e:/el/dot-emacs.el diff --git a/el/dot-emacs.el b/el/dot-emacs.el index c6c038c..c46143c 100644 --- a/el/dot-emacs.el +++ b/el/dot-emacs.el @@ -3979,6 +3979,13 @@ there is sadness." (propertize (number-to-string n) 'face (if (> n 0) 'bold 'shadow)))))) +(defun mdw-try-smerge () + (save-excursion + (goto-char (point-min)) + (when (re-search-forward "^<<<<<<< " nil t) + (smerge-mode 1)))) +(add-hook 'find-file-hook 'mdw-try-smerge t) + ;;;-------------------------------------------------------------------------- ;;; MPC configuration.