From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 9 Sep 2019 19:26:39 +0000 (-0700)
Subject: Merge branch 'sb/userdiff-dts'
X-Git-Tag: v2.24.0-rc0~146
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d49c2c3466d2c8cb0b3d0a43e6b406b07078fdb1;p=thirdparty%2Fgit.git

Merge branch 'sb/userdiff-dts'

Device-tree files learned their own userdiff patterns.

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

d49c2c3466d2c8cb0b3d0a43e6b406b07078fdb1