Package git-merge-changelog

Git merge driver for ChangeLog files

http://www.gnu.org/software/gnulib

Git Merge Changelog is a git merge driver for changelogs that combines
parallel additions to the changelog without generating merge conflicts.
It can be enabled for specific files by setting appropriate git attributes.

General Commands
Command Description
git-merge-changelog manual page for git-merge-changelog git-merge-changelog