Merge pull request #499 from bryangarza/font-lock-warning-face

Fix font-lock-warning-face regular expression for git merge conflict markers

Author: gracjan

haskell-font-lock.el

@@ -372,7 +372,7 @@ Returns keywords suitable for `font-lock-keywords'."
           `(;; NOTICE the ordering below is significant
             ;;
             ("^<<<<<<< .*$" 0 'font-lock-warning-face t)
-            ("^=======" 0 'font-lock-warning-face t)
+            ("^======= .*$" 0 'font-lock-warning-face t)
             ("^>>>>>>> .*$" 0 'font-lock-warning-face t)
             ("^#.*$" 0 'font-lock-preprocessor-face t)