1 files changed, 1 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes
index 51c6be8..3c05377 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,3 @@
 .git* export-ignore
 .mailmap export-ignore
+CHANGELOG_UNRELEASED.md merge=union
+\ No newline at end of file