From: Bruno Haible <bruno@clisp.org>
Date: Thu, 2 Jul 2009 08:33:57 +0000 (+0200)
Subject: Specify custom merge drivers.
X-Git-Tag: v0.18~176
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9eb1959057bebe66cec1ed27e7d5ccbab7a4255c;p=thirdparty%2Fgettext.git

Specify custom merge drivers.
---

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