tree 649dae8fbfe6951521ee612cfe964ba266dd929b
parent 2743b61bc65156d337c0740da5122b58a044b1a5
parent 3c81760bc66376c3ac69c39475cbe3b13e97e798
author Junio C Hamano <gitster@pobox.com> 1568057199 -0700
committer Junio C Hamano <gitster@pobox.com> 1568057199 -0700

Merge branch 'sb/userdiff-dts'

Device-tree files learned their own userdiff patterns.

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