diff --git a/.gitattributes b/.gitattributes
index e5fe571981f..f02f9636b36 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,4 +1,5 @@
 CHANGELOG.md  merge=union
+CHANGELOG.asciidoc  merge=union
 
 # Keep these file types as CRLF (Windows).
 *.bat    text eol=crlf