git: add gitattributes for NEWS merging (#345)

JuliaStats · Nov 29, 2017 · 0ad6e78 · 0ad6e78
1 parent 2cb954e
commit 0ad6e78
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+NEWS.md merge=union