[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: emacs-24 r107805: international/characters.el: Fix sorting.
From: |
Eli Zaretskii |
Subject: |
Re: emacs-24 r107805: international/characters.el: Fix sorting. |
Date: |
Tue, 10 Apr 2012 22:09:37 +0300 |
> From: Andreas Schwab <address@hidden>
> Cc: address@hidden
> Date: Tue, 10 Apr 2012 20:57:17 +0200
>
> Eli Zaretskii <address@hidden> writes:
>
> > Andreas, if you want to change things in this area, please either make
> > the same changes on the trunk,
>
> No. Commits should be merged, not copied.
Then please remove the trunk changes.
> > The way you do it you make the future merge from the branch harder,
> > because there will be conflicts.
>
> You were the one to introduce the conflict.
Actually, I fixed it. But suit yourself.