I've repeatedly encountered a situation where git-merge-changelog is a hindrance rather than a help. Any time I commit a patch on one branch, then want to run 'git cherry-pick' to copy it to another, git-merge-changelog either segfaults or goes into a super-long processing loop trying to resolve all of the differences between the two changelog entries.
Interesting, I never had this problem in GNU Smalltalk. Paolo
