diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-10-24 14:59:10 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-10-24 14:59:10 -0700 |
| commit | e4da4fbe0eea55c26f042f76df58bfc529b46ae0 (patch) | |
| tree | 7ead155867beb400d6bed1d89be73803305f6d31 /mergetools/p4merge | |
| parent | Merge branch 'wk/t1304-wo-USER' (diff) | |
| parent | Handle atexit list internaly for unthreaded builds (diff) | |
| download | tgif-e4da4fbe0eea55c26f042f76df58bfc529b46ae0.tar.xz | |
Merge branch 'eb/no-pthreads'
Allow us build with NO_PTHREADS=NoThanks compilation option.
* eb/no-pthreads:
Handle atexit list internaly for unthreaded builds
pack-objects: set number of threads before checking and warning
index-pack: fix compilation with NO_PTHREADS
Diffstat (limited to 'mergetools/p4merge')
0 files changed, 0 insertions, 0 deletions