From ba73010b8465e1b7fa49883fc1d2fb1a75ff4ffa Mon Sep 17 00:00:00 2001
From: Andreas Mueller <t3kcit@gmail.com>
Date: Thu, 17 Nov 2016 09:37:25 -0500
Subject: [PATCH] use union merge strategy for whatsnew (#7896)

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

diff --git a/.gitattributes b/.gitattributes
index 30cb4536eeea9..cbadea1c06a4c 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -28,3 +28,4 @@
 /sklearn/utils/seq_dataset.c -diff
 /sklearn/utils/sparsefuncs_fast.c -diff
 /sklearn/utils/weight_vector.c -diff
+/doc/whats_new.rst merge=union