Enable union merge for NEWS.md

r-lib · Aug 4, 2014 · 6f414b6 · 6f414b6
1 parent c590b34
commit 6f414b6
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+/NEWS.md merge=union