Re: When do we merge the commits from emacs-25 onto master?

[Eli Zaretskii]

> From: David Engster <address@hidden>
> Date: Mon, 23 Nov 2015 23:43:21 +0100
> Cc: Paul Eggert <address@hidden>, emacs-devel <address@hidden>
> 
> We still haven't figured out how to deal with the generated ChangeLogs,
> so I'm not sure we should merge at the moment.

Would it work to somehow teach gitmerge.el to use the (fixed) text
from ChangeLog.2 as the merge-commit log message, instead of the
original log message at emacs-25 commit time?