Comment 5 for bug 236724

Too much time passed, and that's all I can find now too, so it must be my mind playing tricks with me. So I assume my bug would be about wrong behavior of bzr update. An interesting observation: if I shelve changes before doing an update, then update, then unshelve and commit there are no conflicts.