Add gitattributes file for the changelog

9 years ago · d34dcc66d7
parent f7bb3cdcfe
commit d34dcc66d7
1 changed files with 1 additions and 1 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -1 +1 @@
-* text=auto
+CHANGELOG merge=union