The merge-changelog script was more useful when svn-apply/svn-unapply didn't use --fuzz=3 when applying ChangeLog patches, or when applying a patch using good ol' patch(1).
The resolve-ChangeLogs script should probably subsume the merge-changelog functionality, and then merge-changelog may go away.
Created attachment 17496 [details]
Comment on attachment 17496 [details]
Committed revision 28035.