On Fri, Jul 01, 2005 at 10:20:31AM +0900, Miles Bader wrote: > Ilya Zakharevich <[EMAIL PROTECTED]> writes: > > *Something* must be done in this situation. > > Sure, it sounds like a proper merge is in order. > > That is, apply all Emacs changes since the last merge point to your > current version, and resolve any conflicts.
My point is that most edits must be removed, since they introduce much more problems than they fix. Hope this helps, Ilya _______________________________________________ Emacs-devel mailing list Emacs-devel@gnu.org http://lists.gnu.org/mailman/listinfo/emacs-devel
