summaryrefslogtreecommitdiff
path: root/builtin/merge-file.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2021-04-16 13:53:34 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-04-16 13:53:34 -0700
commit257ae76ba9194c23a57a93033c499ee67bc1b037 (patch)
tree4ab8a2fe47490943026f80ada1019e2af7576693 /builtin/merge-file.c
parentMerge branch 'en/ort-readiness' (diff)
parentmerge-ort: only do pointer arithmetic for non-empty lists (diff)
downloadtgif-257ae76ba9194c23a57a93033c499ee67bc1b037.tar.xz
Merge branch 'ah/merge-ort-ubsan-fix'
Code clean-up for merge-ort backend. * ah/merge-ort-ubsan-fix: merge-ort: only do pointer arithmetic for non-empty lists
Diffstat (limited to 'builtin/merge-file.c')
0 files changed, 0 insertions, 0 deletions