Patch Set 6: I would prefer that you didn't submit this

> > * The compare editor for a file with both index and working dir changes shows conflicts in red

> Done.

I still have this issue. I also could not see a corresponding change in the last patch set. Maybe you forgot to commit that?