Comment 2 for bug 268989

While the example is simple this may seem innocuous but when it occurs multiple times during a merge it becomes really puzzling.

Using bzr status --show-ids helps to understand the issue but the diff output should be human-readable.

See also bug #40472.