diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-05-09 00:25:01 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-05-09 00:25:01 +0300 |
| commit | dc4c3933b189f7c3087008d3dc2b16ef8325ab1b (patch) | |
| tree | 9cba243af9814d38e4db9726679d4df86f4718f8 /userdiff.c | |
| parent | 933fdf8784d0fedaa259c6caf90115cfa7d21184 (diff) | |
| parent | 09dad9256a32affc4a3bc0cf1fa45d5fa6f51231 (diff) | |
Merge branch 'ah/userdiff-markdown'
The userdiff patterns for Markdown documents have been added.
* ah/userdiff-markdown:
userdiff: support Markdown
Diffstat (limited to 'userdiff.c')
| -rw-r--r-- | userdiff.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/userdiff.c b/userdiff.c index 30ab42df8e..1df884ef0b 100644 --- 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 |