From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 10 Dec 2021 22:35:10 +0000 (-0800)
Subject: Merge branch 'rs/mergesort'
X-Git-Tag: v2.35.0-rc0~108
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fc0e3e02c9c7919c03c1def260d83fc96b4f4b3e;p=thirdparty%2Fgit.git

Merge branch 'rs/mergesort'

Bitop fix for platforms whose "long" is 32-bit.

* rs/mergesort:
  mergesort: avoid left shift overflow
---

fc0e3e02c9c7919c03c1def260d83fc96b4f4b3e