From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 31 Jan 2017 21:15:00 +0000 (-0800)
Subject: Merge branch 'ls/travis-p4-on-macos'
X-Git-Tag: v2.12.0-rc0~30
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/4e170adc8ad654bddb9421a4bf51bb4802656262?hp=--cc

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
---

4e170adc8ad654bddb9421a4bf51bb4802656262