From cee8ceb24e8abfe00ccde9b7de30646ec8353e29 Mon Sep 17 00:00:00 2001
From: urso <steffen.siering@elastic.co>
Date: Thu, 7 Jan 2016 22:33:09 +0100
Subject: [PATCH] Add missing gitattributes for CHANGELOG.asciidoc

---
 .gitattributes | 1 +
 1 file changed, 1 insertion(+)

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