|
| From: | Glenn Morris |
| Subject: | Re: Strange ChangeLog entry after merge from emacs-24 |
| Date: | Mon, 08 Dec 2014 12:17:55 -0500 |
| User-agent: | Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) |
Eli Zaretskii wrote: > So there definitely was some problem in that merge. FWIW, I often used to see that kind of thing with bzrmerge.el. (IIRC I think the changelog-merge plugin did it better.) It's just something the person doing the merge needs to watch out for, or that people need to tidy up afterwards.
| [Prev in Thread] | Current Thread | [Next in Thread] |