[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: |
Andreas Schwab |
|
Subject: |
Re: emacs-24 r107805: international/characters.el: Fix sorting. |
|
Date: |
Tue, 10 Apr 2012 20:57:17 +0200 |
|
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.0.95 (gnu/linux) |
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.
> 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.
Andreas.
--
Andreas Schwab, address@hidden
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5
"And now for something completely different."