Andrew's git / gitweb.git / diff
?
Merge branch 'ls/travis-p4-on-macos' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 31 Jan 2017 21:32:04 +0000 (13:32 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 31 Jan 2017 21:32:04 +0000 (13:32 -0800)
Update the definition of the MacOSX test environment used by
TravisCI.

* ls/travis-p4-on-macos:
travis-ci: fix Perforce install on macOS

Trivial merge