Hi Eric, > git-merge-changelog either segfaults
Ouch. It's written as defensively as possible, and checked with valgrind. Therefore I thought that was impossible! > 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 Can you prepare a reproducible example, please? I've never used 'git cherry-pick' (I only really learned how to use 'git merge' and 'git rebase' a couple of days ago), therefore I would have to guess how your commands looked like. Your example can be based on m4.git; I can check that out. Bruno
