diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-08-14 14:53:26 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-08-14 14:53:26 -0400 |
| commit | c18638a1ebc629092960729ad1d98e44dd562c94 (patch) | |
| tree | 0e5d1d48843d6872cb428b91a1dd6af54949d93d | |
| parent | cf4d25f755161951d1ddefbbf50e715707608df8 (diff) | |
emacs: automatically use smerge-mode for git merge files
| -rw-r--r-- | .config/emacs/init.el | 7 |
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) |