Correct marker regexes

`>>>>>>>` and `<<<<<<<` have text after, but `|||||||` and `=======` do not.
haskell · Mar 11, 2015 · 44865d1 · 44865d1
1 parent 7fa3158
commit 44865d1
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/haskell-font-lock.el b/haskell-font-lock.el
@@ -372,7 +372,8 @@ 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) ; "diff3" style
+            ("^=======$" 0 'font-lock-warning-face t)
             ("^>>>>>>> .*$" 0 'font-lock-warning-face t)
             ("^#.*$" 0 'font-lock-preprocessor-face t)