adding .gitattributed (closes #530)

eddelbuettel · eddelbuettel · commit 211dfcda3f94 · 2016-08-03T11:28:26.000-05:00
with thanks to @nathan-russell for the excellent suggestion
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,2 @@
+ChangeLog merge=union
+inst/NEWS.Rd merge=union
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+2016-08-03  Dirk Eddelbuettel  <edd@debian.org>
+
+        * .gitattributes: Added to have ChangeLog and NEWS.Rd merge via union
+
 2016-08-02  James J Balamuta  <balamut2@illinois.edu>
 
         * R/Rcpp.package.skeleton.R: Added autogeneration warning

-Original file line number
+Diff line change
@@ @@ -1,3 +1,7 @@ @@
 +2016-08-03  Dirk Eddelbuettel  <[email protected]>
++
 +        * .gitattributes: Added to have ChangeLog and NEWS.Rd merge via union
++
 -08-02  James J Balamuta  <[email protected]>
         * R/Rcpp.package.skeleton.R: Added autogeneration warning