Don't indent smerge-mode

Fixes #33

diff --git a/aggressive-indent.el b/aggressive-indent.el
index 0d1297c67592ba92e76023ec3957dc95505a85d1..b8142e50dfe331f5baec6172b923a4cb8167c871 100644 (file)
--- a/aggressive-indent.el
+++ b/aggressive-indent.el
@@ -174,6 +174,7 @@ commands will NOT be followed by a re-indent."
     (region-active-p)
     buffer-read-only
     (null (buffer-modified-p))
+    (and (boundp 'smerge-mode) smerge-mode)
     (string-match "\\`[[:blank:]]*\n?\\'" (or (thing-at-point 'line) ""))
     (and (not aggressive-indent-comments-too)
          (aggressive-indent--in-comment-p))