tests: expose automake bug#14560

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

diff --git a/.gitattributes b/.gitattributes
index b6c3614..0d86adb 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1 @@
-ChangeLog merge=merge-changelog
 *.texi* diff=texinfo