diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000..8b077fbd7
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+changelog.txt merge=union