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

cssd1983 · Nov 17, 2016 · ba73010 · ba73010
1 parent 20f4e76
commit ba73010
Showing 1 changed file with 1 addition and 0 deletions.
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