Sync with Git 2.16.3
authorJunio C Hamano <gitster@pobox.com>
Thu, 22 Mar 2018 21:36:51 +0000 (14:36 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 22 Mar 2018 21:36:51 +0000 (14:36 -0700)
Trivial merge