From 9466b2848f1dbf449ee547d39b5bbf332f44fbae Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Sat, 14 Mar 2009 17:28:31 +0100
Subject: Specify custom merge drivers.

---
 .gitattributes | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .gitattributes

(limited to '.gitattributes')

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