From 512f620de51ba01058f19207e46f1a0288be5897 Mon Sep 17 00:00:00 2001
From: Sean Flanigan <sflaniga@redhat.com>
Date: Wed, 8 Apr 2015 16:38:14 +1000
Subject: [PATCH] Set merge=union for release-notes.md in .gitattributes

---
 docs/.gitattributes | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 docs/.gitattributes

diff --git a/docs/.gitattributes b/docs/.gitattributes
new file mode 100644
index 0000000000..1c139b7dbe
--- /dev/null
+++ b/docs/.gitattributes
@@ -0,0 +1 @@
+release-notes.md merge=union