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