diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-01-31 13:32:07 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-01-31 13:32:07 -0800 |
| commit | b1e4e1782f13da2a5160b6f35fe383f1e08ad7b6 (patch) | |
| tree | 9fb21de84a809ae3518ed42781e7d06a2408b843 /xdiff-interface.h | |
| parent | 81037171a59db996e05b98878359362ead6029f9 (diff) | |
| parent | 965cba2e7ee9b272a35d66a11f0a7bf544aa727a (diff) | |
| download | git-b1e4e1782f13da2a5160b6f35fe383f1e08ad7b6.tar.gz git-b1e4e1782f13da2a5160b6f35fe383f1e08ad7b6.tar.xz | |
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
Diffstat (limited to 'xdiff-interface.h')
0 files changed, 0 insertions, 0 deletions