packaging: renamed linaro-glibc.spec -> glibc.spec

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

diff --git a/.gitattributes b/.gitattributes
index 8947e72..06b553d 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,2 @@
+ChangeLog    merge=merge-changelog
 timezone/* -whitespace