Re: changelog-merge plugin and edited ChangeLog entries

[Eli Zaretskii]

> From: Miles Bader <address@hidden>
> Cc: Glenn Morris <address@hidden>,  address@hidden
> Date: Sat, 26 Feb 2011 17:45:05 +0900
> 
> The gnulib "git-merge-changelog" merge program[*] is reported to
> handle this case correctly, and supposedly can be used with either git
> or bzr (or hg).

I know.  But (a) it's a pain to build it on Windows, and (b) it can be
used with bzr only as an external merge tool, which means you cannot
just say "bzr merge ...", because you need a special switch to the
merge command, just for ChangeLog files.