Andrew's git / gitweb.git / diff
?
Merge branch 'jk/run-network-tests-by-default'
authorJunio C Hamano <gitster@pobox.com>
Wed, 5 Mar 2014 23:06:42 +0000 (15:06 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 5 Mar 2014 23:06:45 +0000 (15:06 -0800)
Teach "make test" to run networking tests when possible by default.

* jk/run-network-tests-by-default:
tests: turn on network daemon tests by default

1  2 
t/lib-git-daemon.sh patch | diff1 | diff2 | blob | history
t/lib-httpd.sh patch | diff1 | diff2 | blob | history
diff --cc t/lib-git-daemon.sh
Simple merge
diff --cc t/lib-httpd.sh
Simple merge