Merge branch 'jh/trace2'
commit90f2d88e61e9e66d9813353cc0910598ebf8cb03
authorJunio C Hamano <gitster@pobox.com>
Thu, 30 May 2019 17:50:44 +0000 (30 10:50 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 30 May 2019 17:50:45 +0000 (30 10:50 -0700)
tree84e2d8f5277b7c58e29c61d9c3ce01f354216cb8
parent20aa7c594fbc2e36476daae2f53d7c020306c62c
parent5fdae9d3be45ce17e22b5f7a742cae3dfe687516
Merge branch 'jh/trace2'

* jh/trace2:
  trace2: fix tracing when NO_PTHREADS is defined
trace2/tr2_tls.c