diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-09-27 02:09:20 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-09-27 02:09:20 +0300 |
| commit | 48b21818ca5069285145b2fdb98f2e355637bb06 (patch) | |
| tree | e97f11eecc907ed5c4aec8b0cb7d32fd149d25dc /git-merge-resolve.sh | |
| parent | ebc63580a1287325eef85e96c436de494406fd0a (diff) | |
| parent | f86f49bee9ba76a4fc3811748c1b4b1559c6fd4b (diff) | |
Merge branch 'ls/travis-homebrew-path-fix'
The procedure to build Git on Mac OS X for Travis CI hardcoded the
internal directory structure we assumed HomeBrew uses, which was a
no-no. The procedure has been updated to ask HomeBrew things we
need to know to fix this.
* ls/travis-homebrew-path-fix:
travis-ci: ask homebrew for its path instead of hardcoding it
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions