diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-01-31 13:32:04 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-01-31 13:32:04 -0800 |
| commit | af1a71f11646f6d32a36f0b68183c1e24d37f808 (patch) | |
| tree | 7b6179f549e5872b1e276d343f25d6614125aa7f /mergetools/winmerge | |
| parent | fccb41391f6fd00b7facf2983ff5db94d1780de7 (diff) | |
| parent | 672f51cb83300d1feba8fb00b19afa3b335b2106 (diff) | |
| download | git-af1a71f11646f6d32a36f0b68183c1e24d37f808.tar.gz git-af1a71f11646f6d32a36f0b68183c1e24d37f808.tar.xz | |
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
Diffstat (limited to 'mergetools/winmerge')
0 files changed, 0 insertions, 0 deletions