Merge pull request #543 from gracjan/pr-smerge-mode

Direct users to smerge-mode for conflict markers.

Author: gracjan

haskell-font-lock.el

@@ -321,10 +321,6 @@ Returns keywords suitable for `font-lock-keywords'."
     (setq keywords
           `(;; NOTICE the ordering below is significant
             ;;
-            ("^<<<<<<< .*$" 0 'font-lock-warning-face t)
-            ("^|||||||$" 0 'font-lock-warning-face t) ; "diff3" style
-            ("^=======$" 0 'font-lock-warning-face t)
-            ("^>>>>>>> .*$" 0 'font-lock-warning-face t)
             ("^#.*$" 0 'font-lock-preprocessor-face t)
 
             ,@(haskell-font-lock-symbols-keywords)

haskell-mode.el

@@ -639,7 +639,12 @@ Use `haskell-version' to find out what version of Haskell mode you are
 currently using.
 
 Additional Haskell mode modules can be hooked in via `haskell-mode-hook';
-see documentation for that variable for more details."
+see documentation for that variable for more details.
+
+Minor modes that work well with `haskell-mode':
+
+- `smerge-mode': show and work with diff3 conflict markers used
+  by git, svn and other version control systems."
   :group 'haskell
   ;; paragraph-{start,separate} should treat comments as paragraphs as well.
   (set (make-local-variable 'paragraph-start)