Re: [PATCH] A new merge algorithm, take 2

Fredrik Kuivinen [off-list ref] writes:

I didn't know you could do things like that with git-ls-files :) But
yeah, it's certainly less intrusive to do it that way. It will
probably simplify things a great deal too. Wouldn't '--unmerged' be
the appropriate flag to use for git-ls-files in this case?

Certainly.  I was trying to see if you are paying attention ;-).