From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 31 Jan 2017 21:32:04 +0000 (-0800)
Subject: Merge branch 'ls/travis-p4-on-macos' into maint
X-Git-Tag: v2.11.1~20
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=af1a71f11646f6d32a36f0b68183c1e24d37f808;p=git

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

af1a71f11646f6d32a36f0b68183c1e24d37f808