From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 19 Mar 2023 22:03:13 +0000 (-0700)
Subject: Merge branch 'jk/add-p-unmerged-fix'
X-Git-Tag: v2.41.0-rc0~143
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a9f4a01760fae8b8ee47068120f218c983d3f215;p=thirdparty%2Fgit.git

Merge branch 'jk/add-p-unmerged-fix'

"git add -p" while the index is unmerged sometimes failed to parse
the diff output it internally produces and died, which has been
corrected.

* jk/add-p-unmerged-fix:
  add-patch: handle "* Unmerged path" lines
---

a9f4a01760fae8b8ee47068120f218c983d3f215