Re: merge conlict?

[Andreas Schwab]

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.

Andreas.

-- 
Andreas Schwab, address@hidden
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."