Merge branch 'jt/t5500-unflake'

[thirdparty/git.git] / userdiff.c

diff --git a/userdiff.c b/userdiff.c
index 30ab42df8ef2b0a93b007b5afb484ccd4102c3b0..1df884ef0bbfbba5a751eafc1922369ad818fce5 100644 (file)
--- a/userdiff.c
+++ b/userdiff.c
@@ -79,6 +79,9 @@ PATTERNS("java",
         "|[-+0-9.e]+[fFlL]?|0[xXbB]?[0-9a-fA-F]+[lL]?"
         "|[-+*/<>%&^|=!]="
         "|--|\\+\\+|<<=?|>>>?=?|&&|\\|\\|"),
+PATTERNS("markdown",
+        "^ {0,3}#{1,6}[ \t].*",
+        "[^<>= \t]+"),
 PATTERNS("matlab",
         /*
          * Octave pattern is mostly the same as matlab, except that '%%%' and