|
| From: | Glenn Morris |
| Subject: | emacs-23 to trunk: merge conflicts in files.el |
| Date: | Sat, 12 Feb 2011 18:35:57 -0500 |
| User-agent: | Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) |
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?
| [Prev in Thread] | Current Thread | [Next in Thread] |