]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'uk/userdiff-php-enum'
authorJunio C Hamano <gitster@pobox.com>
Fri, 10 Sep 2021 18:46:27 +0000 (11:46 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 10 Sep 2021 18:46:27 +0000 (11:46 -0700)
Update the userdiff pattern for PHP.

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

1  2 
userdiff.c

diff --cc userdiff.c
Simple merge