* emacs-23 to trunk: merge conflicts in files.el
@ 2011-02-12 23:35 Glenn Morris
2011-02-13 1:54 ` Chong Yidong
0 siblings, 1 reply; 2+ messages in thread
From: Glenn Morris @ 2011-02-12 23:35 UTC (permalink / raw)
To: emacs-devel
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?
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: emacs-23 to trunk: merge conflicts in files.el
2011-02-12 23:35 emacs-23 to trunk: merge conflicts in files.el Glenn Morris
@ 2011-02-13 1:54 ` Chong Yidong
0 siblings, 0 replies; 2+ messages in thread
From: Chong Yidong @ 2011-02-13 1:54 UTC (permalink / raw)
To: Glenn Morris; +Cc: emacs-devel
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.)
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-02-13 1:54 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-02-12 23:35 emacs-23 to trunk: merge conflicts in files.el Glenn Morris
2011-02-13 1:54 ` Chong Yidong
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).