Puzzled about merge conflicts.

[Óscar Fuentes]

Óscar Fuentes <ofv at wanadoo.es> writes:

>>> From there, it's a bit harder to guess what you did, but given
>>> the messages below, you probably 'bzr add' the .BASE, .THIS,
>>> .OTHER files, adding to the confusion.
>>
>> Nope. The only command executed was a `bzr merge other-branch-ur'.
>
> I have a recipe for reproducing this problem. Will create a bug report
> later.

Done: https://bugs.edge.launchpad.net/bzr/+bug/519024