diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-05-18 14:40:08 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-05-18 14:40:08 -0700 |
| commit | 803fd70ceee3b86861d8b09b27861c4f85828b82 (patch) | |
| tree | 29c394c1ef12877d8f952aac5b0e3f55bbe7c886 /t/t7600-merge.sh | |
| parent | 7ab6da3c40420c297016c0a62bece1573d0589ce (diff) | |
| parent | 82f2567e3d01a6eeb4c6a0b9139232034de6e60f (diff) | |
| download | git-803fd70ceee3b86861d8b09b27861c4f85828b82.tar.gz | |
Merge branch 'ls/p4-lfs' into HEAD
Recent update to Git LFS broke "git p4" by changing the output from
its "lfs pointer" subcommand.
* ls/p4-lfs:
git-p4: fix Git LFS pointer parsing
travis-ci: express Linux/OS X dependency versions more clearly
travis-ci: update Git-LFS and P4 to the latest version
Diffstat (limited to 't/t7600-merge.sh')
0 files changed, 0 insertions, 0 deletions