Set merge=union for changelog

This will prevent the vast majority of conflicts with this file being updated concurrently.
seansp-zz · Aug 4, 2016 · d3e5ff9 · d3e5ff9
1 parent a3a149a
commit d3e5ff9
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+CHANGELOG.md merge=union