diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-07-25 14:13:39 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-07-25 14:13:40 -0700 |
| commit | 976809a8e202d40bc32adc4fff0c0b5056f89fca (patch) | |
| tree | 00bc133028d3b537b2283e8a9aa01d2e48d12dc0 /merge.c | |
| parent | Merge branch 'jc/renormalize-merge-kill-safer-crlf' (diff) | |
| parent | travis-ci: enable web server tests t55xx on Linux (diff) | |
| download | tgif-976809a8e202d40bc32adc4fff0c0b5056f89fca.tar.xz | |
Merge branch 'ls/travis-enable-httpd-tests'
Allow http daemon tests in Travis CI tests.
* ls/travis-enable-httpd-tests:
travis-ci: enable web server tests t55xx on Linux
Diffstat (limited to 'merge.c')
0 files changed, 0 insertions, 0 deletions