Merge pull request #501 from bryangarza/git-hunk-markers

Correct marker regexes
haskell · Mar 11, 2015 · f11ee56 · f11ee56
2 parents 7fa3158 + 44865d1
commit f11ee56
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)