diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-04-25 09:41:22 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-04-25 09:41:22 +0200 |
| commit | 0830eac14cf6d0f0392a3a87d96f916e79dc4319 (patch) | |
| tree | 590b6c791f22339b145d79042127206f4f2bd58c /git-merge-resolve.sh | |
| parent | Merge branch 'js/t3301-unbreak-notes-test' (diff) | |
| parent | untracked cache: fix off-by-one (diff) | |
| download | git-0830eac14cf6d0f0392a3a87d96f916e79dc4319.tar.xz git-0830eac14cf6d0f0392a3a87d96f916e79dc4319.zip | |
Merge branch 'js/untracked-cache-allocfix'
An underallocation in the code to read the untracked cache
extension has been corrected.
* js/untracked-cache-allocfix:
untracked cache: fix off-by-one
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions