Comment 5 for bug 4700

OK so the essence of the bug is that bzr conflicts should remember and report non-textual conflicts.

I think Aaron's new conflict-remembering code may be able to accomodate this; I don't know if it's done yet.