From 9e71b260a527571da75c4be106e19bfc73e26a2e Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Mon, 14 Nov 2016 16:26:50 -0500 Subject: [PATCH] - experiment with union merge for changelog Change-Id: Ieed0199c58d7eacdb26db6e1754c1ef3ee5c8c7d (cherry picked from commit 5def69c0cdc5025b1194e8339446b6e5e528df1e) --- .gitattributes | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitattributes 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 -- 2.47.3