Package git-merge-changelog

Git merge driver for ChangeLog files

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 (Section 1)
Merges independent modifications of a ChangeLog style file. O-FILE-NAME names the original file, the ancestor of the two others. A-FILE-NAME names the publicly...