diff --git a/.gitattributes b/.gitattributes
index a900528e47..b64bbed2eb 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,2 @@
 *.pnm -diff -text
+Changelog    merge=union