Merge branch 'jk/archive-zip-userdiff-config' into maint
commitb1e4e1782f13da2a5160b6f35fe383f1e08ad7b6
authorJunio C Hamano <gitster@pobox.com>
Tue, 31 Jan 2017 21:32:07 +0000 (31 13:32 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 31 Jan 2017 21:32:07 +0000 (31 13:32 -0800)
tree9fb21de84a809ae3518ed42781e7d06a2408b843
parent81037171a59db996e05b98878359362ead6029f9
parent965cba2e7ee9b272a35d66a11f0a7bf544aa727a
Merge branch 'jk/archive-zip-userdiff-config' into maint

"git archive" did not read the standard configuration files, and
failed to notice a file that is marked as binary via the userdiff
driver configuration.

* jk/archive-zip-userdiff-config:
  archive-zip: load userdiff config