diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-10-05 12:35:54 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-05 12:35:54 -0700 |
| commit | e2b1405b9445ad87f19625a3740eb802b3f7472f (patch) | |
| tree | 362eb77bd13b1f69cd15b01e7633ca4341cba4b0 /builtin/merge.c | |
| parent | 8f4c996fc32087955e6def30e669ba6d27cec11e (diff) | |
| parent | eb726f2d760dd78915e4a24f014ab411a165daa3 (diff) | |
| download | git-e2b1405b9445ad87f19625a3740eb802b3f7472f.tar.gz | |
Merge branch 'jc/maint-fsck-fwrite-size-check'
* jc/maint-fsck-fwrite-size-check:
fsck: do not abort upon finding an empty blob
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions