tests: avoid a spurious failure on MSYS

[platform/upstream/automake.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index 6fec56e..0d86adb 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,3 +1 @@
-ChangeLog merge=merge-changelog
-NEWS merge=union
 *.texi* diff=texinfo