From: Bruno Haible <bruno@clisp.org>
Date: Mon, 11 Feb 2008 12:27:09 +0000 (+0100)
Subject: Specify custom merge drivers.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=63fdbedfb1e058306fbe60053eef0a050ab99016;p=pspp

Specify custom merge drivers.
---

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.