diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-05-10 13:40:29 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-05-10 13:40:29 -0700 |
| commit | 7a959426b61e673032861f7a89ce9c5254bd5830 (patch) | |
| tree | c9196073c02b64935b55b7ba71e3d27aff4f5f43 /t/t7605-merge-resolve.sh | |
| parent | Merge branch 'sb/misc-cleanups' (diff) | |
| parent | git-p4: fix Git LFS pointer parsing (diff) | |
| download | tgif-7a959426b61e673032861f7a89ce9c5254bd5830.tar.xz | |
Merge branch 'ls/p4-lfs'
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/t7605-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions