test harness: improve catching of usage errors in script 'test-driver'

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

diff --git a/.gitattributes b/.gitattributes
index 5126add..0d86adb 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1 @@
-NEWS merge=union
 *.texi* diff=texinfo