Junio C Hamano a9f4a01760 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

2023-03-19 15:03:13 -07:00

51 KiB

Raw Blame History

View Raw