From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 9 Feb 2022 22:20:59 +0000 (-0800)
Subject: Merge branch 'pw/add-p-hunk-split-fix'
X-Git-Tag: v2.36.0-rc0~178
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ec4f70e64711cbf550b2cfc1f78ccd9325d697b7;p=thirdparty%2Fgit.git

Merge branch 'pw/add-p-hunk-split-fix'

"git add -p" rewritten in C regressed hunk splitting in some cases,
which has been corrected.

* pw/add-p-hunk-split-fix:
  builtin add -p: fix hunk splitting
  t3701: clean up hunk splitting tests
---

ec4f70e64711cbf550b2cfc1f78ccd9325d697b7