* Peter Rosin wrote on Fri, Jan 23, 2009 at 04:39:02PM CET:
>
> I'm preparing a merge with master now instead. Just got to run the
> testsuite on a couple of $hosts/compilers (sigh) before I push...
>
> One funny thing (funny strange, not haha) is that the ChangeLog entries
> from master appeared in reverse order in the pr-msvc-support ChangeLog
> after the merge, and I had to fix that up manually. Pure luck I noticed
> that one...

Are you using the git-merge-changelog merge driver from gnulib?
If yes, then it's probably an artefact of that driver.

Maybe we should think about not having a manually edited ChangeLog file,
but a generated one, just like coreutils.

Cheers, and thanks for the work,
Ralf


Reply via email to