diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-12-09 13:36:56 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-09 13:36:56 -0800 |
| commit | ef87690b27fd1facdc8cc48f6789a930939303a3 (patch) | |
| tree | acabf53e3afd63852d8d1a0b11529cbd2e016eae /builtin/fmt-merge-msg.c | |
| parent | Merge branch 'maint' (diff) | |
| parent | cache.h: put single NUL at end of struct cache_entry (diff) | |
| download | git-ef87690b27fd1facdc8cc48f6789a930939303a3.tar.gz git-ef87690b27fd1facdc8cc48f6789a930939303a3.zip | |
Merge branch 'rs/allocate-cache-entry-individually'
* rs/allocate-cache-entry-individually:
cache.h: put single NUL at end of struct cache_entry
read-cache.c: allocate index entries individually
Conflicts:
read-cache.c
Diffstat (limited to 'builtin/fmt-merge-msg.c')
0 files changed, 0 insertions, 0 deletions