Specify custom merge drivers.

diff --git a/.gitattributes b/.gitattributes
new file mode 100644 (file)
index 0000000..ca4ea27
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+ChangeLog      merge=merge-changelog

diff --git a/ChangeLog b/ChangeLog
index f57750e..1bcb783 100644 (file)
--- 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.