summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitattributes1
-rw-r--r--ChangeLog4
2 files changed, 5 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000000..ca4ea2772a
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+ChangeLog merge=merge-changelog
diff --git a/ChangeLog b/ChangeLog
index f57750e20b..1bcb7835bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-02-11 Bruno Haible <bruno@clisp.org>
+
+ * .gitattributes: New file.
+
2008-02-11 Jim Meyering <meyering@redhat.com>
useless-if-before-free: Fix reversed exit values.