Merge branch 'uk/userdiff-php-enum'
commit6dbe1b4ee21bb52b2069fc0330915483ec020386
authorJunio C Hamano <gitster@pobox.com>
Fri, 10 Sep 2021 18:46:27 +0000 (10 11:46 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 10 Sep 2021 18:46:27 +0000 (10 11:46 -0700)
tree4562d5185d7092271803eb56f7850ccd05fac724
parentfebba8038de552c00f4f4e3f0a5975e31c31550f
parent2c7f3aacd31b564beca3a3d93a98f4efded6af58
Merge branch 'uk/userdiff-php-enum'

Update the userdiff pattern for PHP.

* uk/userdiff-php-enum:
  userdiff: support enum keyword in PHP hunk header
userdiff.c