Re: What is the status of merging with whitespace conflicts?

I am not working on it, and I didn't hear from anybody who is.  If you
limit the whitespace-only changes to the ones that do not cross line
boundary, it wouldn't be too hard to add.  Probably it would take less
than one summer for a good student.