MAINT: reduce the number of git conflicts in the release notes

scipy · Feb 13, 2017 · ed451a1 · ed451a1
1 parent 6607b47
commit ed451a1
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -55,3 +55,6 @@ scipy/sparse/sparsetools/dia.py binary
 scipy/sparse/sparsetools/dia_wrap.cxx binary
 scipy/sparse/sparsetools/csgraph.py binary
 scipy/sparse/sparsetools/csgraph_wrap.cxx binary
+
+# Release notes, reduce number of conflicts.
+doc/release/*.rst merge=union