Merge branch 'cb/xdiff-no-system-includes-in-dot-c' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 9 Aug 2019 22:18:19 +0000 (15:18 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 9 Aug 2019 22:18:19 +0000 (15:18 -0700)
commit5d929ec...cb883f625134b0999476f86e0e85eee4
treecf70117...fde979159deea78c65f6ff0c3c83e7eccopy hash to clipboard (tree)
parent414784d...16befef08743d28017aea75f5d600264copy hash to clipboard (diff)
parent81ed2b4...5cc6eca56fa4ab8eb1fb3efb839e353ccopy hash to clipboard (diff)