[phobos] [D-Programming-Language/phobos] db5b27: Merge branch 'jmdavis-red-black'

[Andrei Alexandrescu]

On 2/26/11 7:59 PM, Jonathan M Davis wrote:
> Well, that's mean of it. It treated those changes like std.array had been
> completed removed and re-added. That makes it rather hard to see any changes.

Trying to merge your changes I had two weird merge errors on apparently 
identical lines (probably trailing whitespace or line terminators). I 
didn't know what the heck to do and ended up doing a booboo. Is it 
possible to somehow undo that crap?

Andrei