Merge pull request #551 from CohenCyril/merge-changelog-by-union

Use union driver for CHANGELOG_UNRELEASED
math-comp · Aug 11, 2020 · d7c08d6 · d7c08d6
2 parents 16a8f48 + dc20e2d
commit d7c08d6
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,2 +1,3 @@
 .git* export-ignore
 .mailmap export-ignore
+CHANGELOG_UNRELEASED.md merge=union