]> git.ipfire.org Git - thirdparty/sqlalchemy/sqlalchemy.git/commitdiff
- experiment with union merge for changelog
authorMike Bayer <mike_mp@zzzcomputing.com>
Mon, 14 Nov 2016 21:26:50 +0000 (16:26 -0500)
committerMike Bayer <mike_mp@zzzcomputing.com>
Mon, 14 Nov 2016 21:26:50 +0000 (16:26 -0500)
Change-Id: Ieed0199c58d7eacdb26db6e1754c1ef3ee5c8c7d

.gitattributes [new file with mode: 0644]

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