Add .gitattributes to improve CHANGELOG merging

rubocop · Jan 13, 2017 · 75fc8d3 · 75fc8d3
1 parent daeb671
commit 75fc8d3
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+CHANGELOG.md merge=union