Merge branch 'sb/userdiff-dts'
authorJunio C Hamano <gitster@pobox.com>
Wed, 23 Oct 2019 05:43:10 +0000 (14:43 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 23 Oct 2019 05:43:10 +0000 (14:43 +0900)
commit2e215b7959a895d6aadbb828622bef966738ed6a
treeb74c6ac48f68f18c5188e0b3d2aa081cf0e75c38
parente3cf08361ae5a277d4cdfbd923f63e8c18634032
parent8da56a484800023a545d7a7c022473f5aa9e720f
Merge branch 'sb/userdiff-dts'

Tweak userdiff patterns for dts.

* sb/userdiff-dts:
  userdiff: fix some corner cases in dts regex