Comment 2 for bug 35015

Revision history for this message
Matthew Paul Thomas (mpt) wrote :

"There are a lot of cases, but they are all treated the same in the code."

Then I guess that's the real bug: it would be very helpful to know which of those things have happened.

As for foo.THIS, I nearly suggested foo.TREE, since bzr uses TREE for conflict markers. But I think YOURS would be more obvious in both cases.