Re: [PATCH] add -p: skip conflicted paths

Junio C Hamano [off-list ref] writes:

I was hoping that we could somehow do this with a single invocation of
ls-files, instead of doing it over and over inside a loop.

Totally untested, but something along this line...

Well, probably along that line but not there.  I think the patch would be
a lot cleaner to keep the part I touched intact, and instead add an extra
"ls-files -u" that creates %unmerged hash in the way this patch does,
immediately before the last for() loop in the function.  And then the loop
can use %unmerged hash to filter the elements.