Merge branch 'ls/travis-p4-on-macos'
authorJunio C Hamano <gitster@pobox.com>
Tue, 31 Jan 2017 21:15:00 +0000 (13:15 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 31 Jan 2017 21:15:00 +0000 (13:15 -0800)
commit4e170adc8ad654bddb9421a4bf51bb4802656262
treed944ee6f827b581e2cdbc6518d240405b493f0a6
parenta49260b17d39434bbdf5d55991c90aa2f42ea64c
parent672f51cb83300d1feba8fb00b19afa3b335b2106
Merge branch 'ls/travis-p4-on-macos'

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

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