-
Richard Clamp authored
https://git-scm.com/docs/gitattributes#_performing_a_three_way_merge In fee58e6556bd6d7e700347f92a42693af87a687e the file was renamed from CHANGELOG -> CHANGELOG.md and later converted to markdown. Here we update the .gitattributes to reflect the rename, as merge=union will probably reduce some of the rebase conflicts in CHANGELOG.md
Richard Clamp authoredhttps://git-scm.com/docs/gitattributes#_performing_a_three_way_merge In fee58e6556bd6d7e700347f92a42693af87a687e the file was renamed from CHANGELOG -> CHANGELOG.md and later converted to markdown. Here we update the .gitattributes to reflect the rename, as merge=union will probably reduce some of the rebase conflicts in CHANGELOG.md