Re: merge conlict?

[Óscar Fuentes]

Andreas Schwab <address@hidden> writes:

> Eli Zaretskii <address@hidden> writes:
>
>> The one you mention was part of what I showed.  This one, to be
>> precise:
>>
>>     99266.1.22: Katsumi Yamaoka 2010-01-21 [merge] Merge from mainline.
>>
>> It has no deeper revisions, so I really don't see your point.
>
> This revision is merging trunk into a branch, exactly the same what
> address@hidden did.

That revision had no effect on the output of `bzr log'. No revisions
that previously were visible as trunk's mainline became magically hidden
as merged history.