On Sat, May 12, 2012 at 03:27:50PM -0400, Greg Stein wrote: > It basically is because "everywhere" we check for a recorded text conflict, > we double-check to see if the conflict files were removed. Removal > suppresses the conflict.
I still think this is entirely stupid behaviour that just forces us to write special-case code for text conflicts, but I concede. See 1337844. Does that look sound?
