diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-01-17 14:49:27 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-01-17 14:49:27 -0800 |
| commit | cf479b4fb5d8417ccea306fa9f3491ec2e873399 (patch) | |
| tree | 372268c7b11fe5889f43a58f24d861c90373ff81 /merge-recursive.c | |
| parent | b3dac9c07858e7b8b9c99a371c67129c2e7909e3 (diff) | |
| parent | d5eb3cf5e7e4274e12e0f249b3a026c029f3b02c (diff) | |
| download | git-cf479b4fb5d8417ccea306fa9f3491ec2e873399.tar.gz git-cf479b4fb5d8417ccea306fa9f3491ec2e873399.tar.xz | |
Merge branch 'ls/p4-empty-file-on-lfs' into maint
"git p4" LFS support was broken when LFS stores an empty blob.
* ls/p4-empty-file-on-lfs:
git-p4: fix empty file processing for large file system backend GitLFS
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions