Merge mktime, timegm from upstream Gnulib

[thirdparty/glibc.git] / .gitattributes

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