add-patch: handle "* Unmerged path" lines