[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: merge conlict?

From: Óscar Fuentes
Subject: Re: merge conlict?
Date: Mon, 25 Jan 2010 13:43:28 +0100
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.91 (gnu/linux)

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.

reply via email to

[Prev in Thread] Current Thread [Next in Thread]