From 3aeaa1f76eb47b5300f390b20258dd28aaab5986 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kirill=20M=C3=BCller?= <kirill.mueller@ivt.baug.ethz.ch>
Date: Tue, 25 Feb 2014 15:07:26 +0100
Subject: [PATCH] Avoid merge conflicts in NEWS file

by using the `union` merge strategy.

See also http://krlmlr.github.io/using-gitattributes-to-avoid-merge-conflicts/.
---
 .Rbuildignore  | 1 +
 .gitattributes | 1 +
 2 files changed, 2 insertions(+)
 create mode 100644 .gitattributes

diff --git a/.Rbuildignore b/.Rbuildignore
index db6b83d3c..794e09772 100644
--- a/.Rbuildignore
+++ b/.Rbuildignore
@@ -2,3 +2,4 @@ visual_test
 ^.*\.Rproj$
 ^\.Rproj\.user$
 ^\.travis\.yml$
+^/\.gitattributes$
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000..5a9da3931
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+/NEWS merge=union