Merge branch 'ah/merge-ort-ubsan-fix'
commit257ae76ba9194c23a57a93033c499ee67bc1b037
authorJunio C Hamano <gitster@pobox.com>
Fri, 16 Apr 2021 20:53:34 +0000 (16 13:53 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 16 Apr 2021 20:53:34 +0000 (16 13:53 -0700)
tree4ab8a2fe47490943026f80ada1019e2af7576693
parent7bec8e7fa6175f51e79c55e28e6b2a547a986926
parentc1ea48a8f74cfb39f9c0583b26b79a038c3d9ab8
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
merge-ort.c