diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-09-19 10:47:54 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-09-19 10:47:54 +0900 |
| commit | b86e112056a5fb9515a28527a7c1976ec972b0db (patch) | |
| tree | be2a73c659ee4a23f37e7e582724950b33e61ac5 /git-merge-resolve.sh | |
| parent | Merge branch 'bb/doc-eol-dirty' (diff) | |
| parent | hashmap: add API to disable item counting when threaded (diff) | |
| download | tgif-b86e112056a5fb9515a28527a7c1976ec972b0db.tar.xz | |
Merge branch 'jh/hashmap-disable-counting'
Our hashmap implementation in hashmap.[ch] is not thread-safe when
adding a new item needs to expand the hashtable by rehashing; add
an API to disable the automatic rehashing to work it around.
* jh/hashmap-disable-counting:
hashmap: add API to disable item counting when threaded
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions