1 files changed, 1 insertions, 0 deletions

diff --git a/.gitattribute b/.gitattribute
new file mode 100644
index 0000000000..253cc6dee4
--- /dev/null
+++ b/.gitattribute
@@ -0,0 +1 @@
+Misc/NEWS   merge=union