From 3222fc79431c0866aa65b2a83fbbffd2c3034d08 Mon Sep 17 00:00:00 2001
From: Adam Chainz <adam@adamj.eu>
Date: Tue, 2 Jun 2015 16:11:19 +0100
Subject: [PATCH] Added git attribute merge=union for release notes

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

diff --git a/.gitattributes b/.gitattributes
index cd42cc51ca..4bd6655ffd 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -3,3 +3,4 @@
 *css text eol=lf
 tests/staticfiles_tests/apps/test/static/test/*txt text eol=lf
 tests/staticfiles_tests/project/documents/test/*txt text eol=lf
+docs/releases/*.txt merge=union