.gitattributes
5b1d51c2
 CHANGELOG.md merge=union