Adds a gitattribute file to manage changelog merges

2019-04-10 13:44:55 -07:00 · 2019-04-10 13:44:55 -07:00 · 7e6d911657
commit 7e6d911657
--- a/.gitattributes
+++ b/.gitattributes
@ -0,0 +1 @@
+CHANGELOG.md merge=union