Re: merge conlict?

[Eli Zaretskii]

> From: Andreas Schwab <address@hidden>
> Date: Mon, 25 Jan 2010 12:06:01 +0100
> Cc: address@hidden
> 
> Óscar Fuentes <address@hidden> writes:
> 
> > Katsumi Yamaoka merges his changes into trunk,
> 
> No, it merges trunk into a branch.

Look, Andreas, if you want to help in understanding what, if anything,
is wrong with Mark's commit, please tell that in enough words that
mere mortals can understand.  Otherwise, you are just raising the
noise level, so please leave us alone in this thread and let us find
out the truth our way.  Okay?