Merge branch 'sb/userdiff-dts'
commitd49c2c3466d2c8cb0b3d0a43e6b406b07078fdb1
authorJunio C Hamano <gitster@pobox.com>
Mon, 9 Sep 2019 19:26:39 +0000 (9 12:26 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 9 Sep 2019 19:26:39 +0000 (9 12:26 -0700)
tree649dae8fbfe6951521ee612cfe964ba266dd929b
parent2743b61bc65156d337c0740da5122b58a044b1a5
parent3c81760bc66376c3ac69c39475cbe3b13e97e798
Merge branch 'sb/userdiff-dts'

Device-tree files learned their own userdiff patterns.

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