diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000..9556c6763
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+doc/changelog.asciidoc merge=union