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)
commitaf1a71f11646f6d32a36f0b68183c1e24d37f808
tree7b6179f549e5872b1e276d343f25d6614125aa7f
parentfccb41391f6fd00b7facf2983ff5db94d1780de7
parent672f51cb83300d1feba8fb00b19afa3b335b2106
Merge branch 'ls/travis-p4-on-macos' into maint

Update the definition of the MacOSX test environment used by
TravisCI.

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