Comment 1 for bug 248411

Revision history for this message
Robert Collins (lifeless) wrote : Re: [Bug 248411] [NEW] Bad merge

Scott reported this at my urging: it apparently demonstrates a merge
case that git handles more gracefully. We haven't tried shoving the
content in git and seeing what happens.

-Rob