Comment 10 for bug 235407

So this should only happen if you do "bzr merge --force", and merge something which has already been merged. In bzr.dev it should not set a new pending merge (since it is already present).

It will still fail during "bzr status" in a tree that was generated in the past. A simple "bzr revert && bzr merge ..." will re-do whatever merge you needed done.