From: Eli Zaretskii <eliz@gnu.org>
To: Andreas Schwab <schwab@linux-m68k.org>
Cc: emacs-devel@gnu.org
Subject: Re: emacs-24 r107805: international/characters.el: Fix sorting.
Date: Tue, 10 Apr 2012 22:09:37 +0300 [thread overview]
Message-ID: <83vcl75rpq.fsf@gnu.org> (raw)
In-Reply-To: <m2r4vvifea.fsf@igel.home>
> From: Andreas Schwab <schwab@linux-m68k.org>
> Cc: emacs-devel@gnu.org
> Date: Tue, 10 Apr 2012 20:57:17 +0200
>
> Eli Zaretskii <eliz@gnu.org> 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.
next prev parent reply other threads:[~2012-04-10 19:09 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-10 16:55 emacs-24 r107805: international/characters.el: Fix sorting Eli Zaretskii
2012-04-10 17:23 ` Glenn Morris
2012-04-10 18:19 ` Eli Zaretskii
2012-04-10 18:37 ` Stefan Monnier
2012-04-10 18:57 ` Andreas Schwab
2012-04-10 19:09 ` Eli Zaretskii [this message]
2012-04-10 20:52 ` Andreas Schwab
2012-04-11 6:46 ` Eli Zaretskii
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=83vcl75rpq.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=schwab@linux-m68k.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.