From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Mon, 14 Nov 2016 21:26:50 +0000 (-0500)
Subject: - experiment with union merge for changelog
X-Git-Tag: rel_1_1_4~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5def69c0cdc5025b1194e8339446b6e5e528df1e;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- experiment with union merge for changelog

Change-Id: Ieed0199c58d7eacdb26db6e1754c1ef3ee5c8c7d
---

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000000..ffa4fc4c0e
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+doc/build/changelog/*.rst merge=union