From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Tue, 14 Feb 2012 12:25:35 +0000 (+0100)
Subject: gitattributes: custom merge driver for ChangeLog not needed anymore
X-Git-Tag: v1.11.3b~17^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=06684c510ab3115093178cdcfb28c2fff41b324c;p=thirdparty%2Fautomake.git

gitattributes: custom merge driver for ChangeLog not needed anymore

* .gitattributes: We don't maintain a version-controlled ChangeLog
file anymore, so we have no need to specify a custom merge driver
for it anymore.  Update accordingly.
---

diff --git a/.gitattributes b/.gitattributes
index 6fec56e1b..5126add6d 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,3 +1,2 @@
-ChangeLog merge=merge-changelog
 NEWS merge=union
 *.texi* diff=texinfo