From c18638a1ebc629092960729ad1d98e44dd562c94 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Wed, 14 Aug 2013 14:53:26 -0400
Subject: emacs: automatically use smerge-mode for git merge files

---
 .config/emacs/init.el | 7 +++++++
 1 file changed, 7 insertions(+)

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)
-- 
cgit v1.2.3