[git] allow merge=union on the changelog file

so changelogs are easier rebased
eloycoto · Mar 14, 2017 · fdccd36 · fdccd36
1 parent c6ea2e3
commit fdccd36
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+CHANGELOG.md merge=union