[isabelle-dev] Changed theory merge behaviour

[Manuel Eberl]

I forgot to mention the changeset ID. The problem occurs in
d32e702d7ab8, but I don't think that's the earliest changeset that
exhibits these problems.