add .gitattributes file for avoiding merge errors for NEWS.md

hadley · Apr 7, 2015 · f9db05b · f9db05b
1 parent 87b0330
commit f9db05b
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+/NEWS.md merge=union