Merge branch 'wd/userdiff-css'
commit8699b74ae1190b90facdbe83a879251c8a9e07ac
authorJunio C Hamano <gitster@pobox.com>
Mon, 20 Jun 2016 18:01:02 +0000 (20 11:01 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 20 Jun 2016 18:01:02 +0000 (20 11:01 -0700)
treef92ce3547ca3bdd0e39ae3e245489dce74489b93
parent1958a17fe41ab424d7d655de66a04a7711e7bbd3
parent0719f3eecd1234f6331cab980088239207e93335
Merge branch 'wd/userdiff-css'

Update the funcname definition to support css files.

* wd/userdiff-css:
  userdiff: add built-in pattern for CSS