Merge pull request #664 from urso/fix/changelog-gitattributes

Add missing gitattributes for CHANGELOG.asciidoc
elastic · Jan 7, 2016 · d52029e · d52029e
2 parents 4304cc7 + cee8ceb
commit d52029e
Showing 1 changed file with 1 addition and 0 deletions.
diff --git 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