Merge branch 'sb/userdiff-dts'
authorJunio C Hamano <gitster@pobox.com>
Mon, 9 Sep 2019 19:26:39 +0000 (12:26 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 9 Sep 2019 19:26:39 +0000 (12:26 -0700)
Device-tree files learned their own userdiff patterns.

* sb/userdiff-dts:
userdiff: add a builtin pattern for dts files

Trivial merge