diff --git a/.gitattributes b/.gitattributes index a298e8004fb..ddf4e13e4a1 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1,2 @@ CHANGELOG.asciidoc merge=union +* -text