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