git-merge-changelog 20240412~dfb7117+stable202401.20240408~aa0aa87-3 (i386 binary) in ubuntu oracular

 ChangeLog files *always* foul up most version control systems in
 their default configuration.
 .
 git-merge-changelog is a tool from gnulib designed to help with this
 for the case of GNU-style ChangeLogs; it can be used with at least
 git, bzr, and hg.