From: Chong Yidong <cyd@stupidchicken.com>
To: Glenn Morris <rgm@gnu.org>
Cc: emacs-devel@gnu.org
Subject: Re: emacs-23 to trunk: merge conflicts in files.el
Date: Sat, 12 Feb 2011 20:54:27 -0500 [thread overview]
Message-ID: <yyxzkq07l7w.fsf@fencepost.gnu.org> (raw)
In-Reply-To: <d4fwrs4yhu.fsf@fencepost.gnu.org> (Glenn Morris's message of "Sat, 12 Feb 2011 18:35:57 -0500")
Glenn Morris <rgm@gnu.org> writes:
> I tried merging emacs-23 to trunk, but was unable to resolve a series of
> confusing conflicts in files.el. Are commits 100467 and 100455 supposed
> to be merged?
I just did the merge. (I was going to do it immediately after 100467,
but got held up.)
prev parent reply other threads:[~2011-02-13 1:54 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-12 23:35 emacs-23 to trunk: merge conflicts in files.el Glenn Morris
2011-02-13 1:54 ` Chong Yidong [this message]
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
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=yyxzkq07l7w.fsf@fencepost.gnu.org \
--to=cyd@stupidchicken.com \
--cc=emacs-devel@gnu.org \
--cc=rgm@gnu.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 public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).