use union merge strategy for whatsnew (scikit-learn#7896)

amueller · web-flow · commit ba73010b8465 · 2016-11-17T09:37:25.000-05:00
diff --git 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
