summaryrefslogtreecommitdiff
path: root/thread-utils.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2019-09-09 12:26:36 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-09-09 12:26:36 -0700
commitd1a251a1fa686dc98f7e3160143dfa809ec1a51d (patch)
tree21721377ebe5950aded37c52b264d4cfe22106a9 /thread-utils.h
parentMerge branch 'sg/diff-indent-heuristic-non-experimental' (diff)
parentcheckout: remove duplicate code (diff)
downloadtgif-d1a251a1fa686dc98f7e3160143dfa809ec1a51d.tar.xz
Merge branch 'en/checkout-mismerge-fix'
Fix a mismerge that happened in 2.22 timeframe. * en/checkout-mismerge-fix: checkout: remove duplicate code
Diffstat (limited to 'thread-utils.h')
0 files changed, 0 insertions, 0 deletions