diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-01-11 18:34:43 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-01-11 18:34:43 -0800 |
| commit | bf3f167d65fec8028b488ef0ce3baaa69a571ffd (patch) | |
| tree | 4a7caa4e5b9e1d72e7365da86c2a7971608f4d37 /builtin/merge.c | |
| parent | Merge branch 'jn/xml-depends-on-asciidoc-conf' (diff) | |
| parent | t5003: check if unzip supports symlinks (diff) | |
| download | tgif-bf3f167d65fec8028b488ef0ce3baaa69a571ffd.tar.xz | |
Merge branch 'rs/zip-tests'
Update zip tests to skip some that cannot be handled on platform
unzip.
* rs/zip-tests:
t5003: check if unzip supports symlinks
t5000, t5003: move ZIP tests into their own script
t0024, t5000: use test_lazy_prereq for UNZIP
t0024, t5000: clear variable UNZIP, use GIT_UNZIP instead
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions