Re: merging emacs-24

[Stefan Monnier]

GM> Also, the ChangeLogs for the changes marked "backport" (etc, check for
GM> any commit that matches bzrmerge-skip-regexp) have all been merged back
GM> to trunk, leading to duplicate entries. The new ones should all be
GM> removed. This is part of what bzrmerge.el handled.
> I don't think Git merges can work that way, though.

Glenn is talking about the content of the ChangeLog files.  To Git
(just as Bzr before) they're just files, not metadata, so of course you
can add/remove any entry you feel like.


        Stefan