diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-09-10 21:46:27 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-09-10 21:46:27 +0300 |
| commit | 6dbe1b4ee21bb52b2069fc0330915483ec020386 (patch) | |
| tree | 4562d5185d7092271803eb56f7850ccd05fac724 /userdiff.c | |
| parent | febba8038de552c00f4f4e3f0a5975e31c31550f (diff) | |
| parent | 2c7f3aacd31b564beca3a3d93a98f4efded6af58 (diff) | |
Merge branch 'uk/userdiff-php-enum'
Update the userdiff pattern for PHP.
* uk/userdiff-php-enum:
userdiff: support enum keyword in PHP hunk header
Diffstat (limited to 'userdiff.c')
| -rw-r--r-- | userdiff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/userdiff.c b/userdiff.c index b073e5563b..af02b1878c 100644 --- a/userdiff.c +++ b/userdiff.c @@ -228,7 +228,7 @@ PATTERNS("perl", "|<<|<>|<=>|>>"), PATTERNS("php", "^[\t ]*(((public|protected|private|static|abstract|final)[\t ]+)*function.*)$\n" - "^[\t ]*((((final|abstract)[\t ]+)?class|interface|trait).*)$", + "^[\t ]*((((final|abstract)[\t ]+)?class|enum|interface|trait).*)$", /* -- */ "[a-zA-Z_][a-zA-Z0-9_]*" "|[-+0-9.e]+|0[xXbB]?[0-9a-fA-F]+" |