summaryrefslogtreecommitdiff
path: root/merge-blobs.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2019-05-30 10:50:44 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-05-30 10:50:45 -0700
commit90f2d88e61e9e66d9813353cc0910598ebf8cb03 (patch)
tree84e2d8f5277b7c58e29c61d9c3ce01f354216cb8 /merge-blobs.h
parentMerge branch 'nd/diff-parseopt' (diff)
parenttrace2: fix tracing when NO_PTHREADS is defined (diff)
downloadtgif-90f2d88e61e9e66d9813353cc0910598ebf8cb03.tar.xz
Merge branch 'jh/trace2'
* jh/trace2: trace2: fix tracing when NO_PTHREADS is defined
Diffstat (limited to 'merge-blobs.h')
0 files changed, 0 insertions, 0 deletions